From 9e1bcae5453e49e5b2c67db88c923bfdf67ec4e2 Mon Sep 17 00:00:00 2001 From: Abi Raja Date: Wed, 10 Apr 2024 14:51:15 -0400 Subject: [PATCH] remove access code/token functionality --- backend/access_token.py | 21 --- backend/routes/generate_code.py | 27 +--- frontend/src/App.tsx | 8 +- frontend/src/components/PicoBadge.tsx | 30 +--- frontend/src/components/SettingsDialog.tsx | 6 - .../components/settings/AccessCodeSection.tsx | 142 ------------------ frontend/src/types.ts | 1 - 7 files changed, 16 insertions(+), 219 deletions(-) delete mode 100644 backend/access_token.py delete mode 100644 frontend/src/components/settings/AccessCodeSection.tsx diff --git a/backend/access_token.py b/backend/access_token.py deleted file mode 100644 index 35fa657..0000000 --- a/backend/access_token.py +++ /dev/null @@ -1,21 +0,0 @@ -import json -import os -import httpx - - -async def validate_access_token(access_code: str): - async with httpx.AsyncClient() as client: - url = ( - "https://backend.buildpicoapps.com/screenshot_to_code/validate_access_token" - ) - data = json.dumps( - { - "access_code": access_code, - "secret": os.environ.get("PICO_BACKEND_SECRET"), - } - ) - headers = {"Content-Type": "application/json"} - - response = await client.post(url, content=data, headers=headers) - response_data = response.json() - return response_data diff --git a/backend/routes/generate_code.py b/backend/routes/generate_code.py index 259983f..a7edb9b 100644 --- a/backend/routes/generate_code.py +++ b/backend/routes/generate_code.py @@ -16,7 +16,6 @@ from mock_llm import mock_completion from typing import Dict, List, cast, get_args from image_generation import create_alt_url_mapping, generate_images from prompts import assemble_imported_code_prompt, assemble_prompt -from access_token import validate_access_token from datetime import datetime import json from prompts.claude_prompts import VIDEO_PROMPT @@ -98,27 +97,13 @@ async def stream_code(websocket: WebSocket): # Get the OpenAI API key from the request. Fall back to environment variable if not provided. # If neither is provided, we throw an error. openai_api_key = None - if "accessCode" in params and params["accessCode"]: - print("Access code - using platform API key") - res = await validate_access_token(params["accessCode"]) - if res["success"]: - openai_api_key = os.environ.get("PLATFORM_OPENAI_API_KEY") - else: - await websocket.send_json( - { - "type": "error", - "value": res["failure_reason"], - } - ) - return + if params["openAiApiKey"]: + openai_api_key = params["openAiApiKey"] + print("Using OpenAI API key from client-side settings dialog") else: - if params["openAiApiKey"]: - openai_api_key = params["openAiApiKey"] - print("Using OpenAI API key from client-side settings dialog") - else: - openai_api_key = os.environ.get("OPENAI_API_KEY") - if openai_api_key: - print("Using OpenAI API key from environment variable") + openai_api_key = os.environ.get("OPENAI_API_KEY") + if openai_api_key: + print("Using OpenAI API key from environment variable") if not openai_api_key and code_generation_model == "gpt_4_vision": print("OpenAI API key not found") diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 5a51bc6..2329105 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -66,7 +66,6 @@ function App() { codeGenerationModel: CodeGenerationModel.GPT_4_VISION, // Only relevant for hosted version isTermOfServiceAccepted: false, - accessCode: null, }, "setting" ); @@ -362,7 +361,7 @@ function App() { return (
- {IS_RUNNING_ON_CLOUD && } + {IS_RUNNING_ON_CLOUD && } {IS_RUNNING_ON_CLOUD && ( } - {IS_RUNNING_ON_CLOUD && - !(settings.openAiApiKey || settings.accessCode) && ( - - )} + {IS_RUNNING_ON_CLOUD && !settings.openAiApiKey && } {IS_OPENAI_DOWN && (
diff --git a/frontend/src/components/PicoBadge.tsx b/frontend/src/components/PicoBadge.tsx index 70a4f20..bdd0083 100644 --- a/frontend/src/components/PicoBadge.tsx +++ b/frontend/src/components/PicoBadge.tsx @@ -1,6 +1,4 @@ -import { Settings } from "../types"; - -export function PicoBadge({ settings }: { settings: Settings }) { +export function PicoBadge() { return ( <> - {!settings.accessCode && ( - -
+
- an open source project by Pico -
-
- )} - {settings.accessCode && ( - -
- email support -
-
- )} + > + an open source project by Pico +
+ ); } diff --git a/frontend/src/components/SettingsDialog.tsx b/frontend/src/components/SettingsDialog.tsx index ea23bc8..2e7814b 100644 --- a/frontend/src/components/SettingsDialog.tsx +++ b/frontend/src/components/SettingsDialog.tsx @@ -22,7 +22,6 @@ import { AccordionItem, AccordionTrigger, } from "./ui/accordion"; -import AccessCodeSection from "./settings/AccessCodeSection"; interface Props { settings: Settings; @@ -47,11 +46,6 @@ function SettingsDialog({ settings, setSettings }: Props) { Settings - {/* Access code */} - {IS_RUNNING_ON_CLOUD && ( - - )} -