Upload 15 files

.github/workflows/docker-deploy.yml

@@ -36,7 +36,7 @@ jobs:
       with:
         context: .  # The context is the root of your repository
         push: true  # Automatically push the image after building
-        tags: ${{ secrets.DOCKER_USERNAME }}/blackboxv2:v7  # Replace 'your-app-name' with your desired Docker image name
+        tags: ${{ secrets.DOCKER_USERNAME }}/blackboxv2:v100  # Replace 'your-app-name' with your desired Docker image name
 
     # Step 5: Log out of Docker Hub
     - name: Log out of Docker Hub

Dockerfile

@@ -26,4 +26,4 @@ COPY . .
 EXPOSE 8001
 
 # Command to run the FastAPI app with Uvicorn
-CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8001"]
+CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8001"]

api/config.py

@@ -1,259 +1,259 @@
-import os
-from dotenv import load_dotenv
-
-load_dotenv()
-
-# Base URL and Common Headers
-BASE_URL = "https://www.blackbox.ai"
-common_headers = {
-    'accept': '*/*',
-    'accept-language': 'en-US,en;q=0.9',
-    'cache-control': 'no-cache',
-    'origin': BASE_URL,
-    'pragma': 'no-cache',
-    'priority': 'u=1, i',
-    'sec-ch-ua': '"Google Chrome";v="131", "Chromium";v="131", "Not_A Brand";v="24"',
-    'sec-ch-ua-arch': '"x86"',
-    'sec-ch-ua-bitness': '"64"',
-    'sec-ch-ua-full-version': '"131.0.6778.69"',
-    'sec-ch-ua-full-version-list': '"Google Chrome";v="131.0.6778.69", "Chromium";v="131.0.6778.69", "Not_A Brand";v="24.0.0.0"',
-    'sec-ch-ua-mobile': '?0',
-    'sec-ch-ua-platform': '"Windows"',
-    'sec-ch-ua-platform-version': '"19.0.0"',
-    'sec-fetch-dest': 'empty',
-    'sec-fetch-mode': 'cors',
-    'sec-fetch-site': 'same-origin',
-    'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
-}
-
-
-# Header Configurations for Specific API Calls
-def get_headers_api_chat(referer_url):
-    return {**common_headers, 'Content-Type': 'application/json', 'Referer': referer_url}
-
-def get_headers_chat(chat_url, next_action, next_router_state_tree):
-    return {
-        **common_headers,
-        'Accept': 'text/x-component',
-        'Content-Type': 'text/plain;charset=UTF-8',
-        'Referer': chat_url,
-        'next-action': next_action,
-        'next-router-state-tree': next_router_state_tree,
-        'next-url': '/',
-    }
-
-
-APP_SECRET = os.getenv("APP_SECRET")
-
-ALLOWED_MODELS = [
-    {"id": "blackboxai", "name": "blackboxai"},
-    {"id": "blackboxai-pro", "name": "blackboxai-pro"},
-    {"id": "flux", "name": "flux"},
-    {"id": "llama-3.1-8b", "name": "llama-3.1-8b"},
-    {"id": "llama-3.1-70b", "name": "llama-3.1-70b"},
-    {"id": "llama-3.1-405b", "name": "llama-3.1-405"},
-    {"id": "gpt-4o", "name": "gpt-4o"},
-    {"id": "gemini-pro", "name": "gemini-pro"},
-    {"id": "gemini-1.5-flash", "name": "gemini-1.5-flash"},
-    {"id": "claude-sonnet-3.5", "name": "claude-sonnet-3.5"},
-    {"id": "PythonAgent", "name": "PythonAgent"},
-    {"id": "JavaAgent", "name": "JavaAgent"},
-    {"id": "JavaScriptAgent", "name": "JavaScriptAgent"},
-    {"id": "HTMLAgent", "name": "HTMLAgent"},
-    {"id": "GoogleCloudAgent", "name": "GoogleCloudAgent"},
-    {"id": "AndroidDeveloper", "name": "AndroidDeveloper"},
-    {"id": "SwiftDeveloper", "name": "SwiftDeveloper"},
-    {"id": "Next.jsAgent", "name": "Next.jsAgent"},
-    {"id": "MongoDBAgent", "name": "MongoDBAgent"},
-    {"id": "PyTorchAgent", "name": "PyTorchAgent"},
-    {"id": "ReactAgent", "name": "ReactAgent"},
-    {"id": "XcodeAgent", "name": "XcodeAgent"},
-    {"id": "AngularJSAgent", "name": "AngularJSAgent"},
-    {"id": "HerokuAgent", "name": "HerokuAgent"},
-    {"id": "GodotAgent", "name": "GodotAgent"},
-    {"id": "GoAgent", "name": "GoAgent"},
-    {"id": "GitlabAgent", "name": "GitlabAgent"},
-    {"id": "GitAgent", "name": "GitAgent"},
-    {"id": "RepoMap", "name": "RepoMap"},
-    {"id": "gemini-1.5-pro-latest", "name": "gemini-pro"},
-    {"id": "gemini-1.5-pro", "name": "gemini-1.5-pro"},
-    {"id": "claude-3-5-sonnet-20240620", "name": "claude-sonnet-3.5"},
-    {"id": "claude-3-5-sonnet", "name": "claude-sonnet-3.5"},
-    {"id": "Niansuh", "name": "Niansuh"},
-    {"id": "o1-preview", "name": "o1-preview"},
-    {"id": "claude-3-5-sonnet-20241022", "name": "claude-3-5-sonnet-20241022"},
-    {"id": "claude-3-5-sonnet-x", "name": "claude-3-5-sonnet-x"},
-
-    # Added New Agents
-    {"id": "FlaskAgent", "name": "FlaskAgent"},
-    {"id": "FirebaseAgent", "name": "FirebaseAgent"},
-    {"id": "FastAPIAgent", "name": "FastAPIAgent"},
-    {"id": "ErlangAgent", "name": "ErlangAgent"},
-    {"id": "ElectronAgent", "name": "ElectronAgent"},
-    {"id": "DockerAgent", "name": "DockerAgent"},
-    {"id": "DigitalOceanAgent", "name": "DigitalOceanAgent"},
-    {"id": "BitbucketAgent", "name": "BitbucketAgent"},
-    {"id": "AzureAgent", "name": "AzureAgent"},
-    {"id": "FlutterAgent", "name": "FlutterAgent"},
-    {"id": "YoutubeAgent", "name": "YoutubeAgent"},
-    {"id": "builderAgent", "name": "builderAgent"},
-]
-
-MODEL_MAPPING = {
-    "blackboxai": "blackboxai",
-    "blackboxai-pro": "blackboxai-pro",
-    "flux": "flux",
-    "ImageGeneration": "flux",
-    "llama-3.1-8b": "llama-3.1-8b",
-    "llama-3.1-70b": "llama-3.1-70b",
-    "llama-3.1-405b": "llama-3.1-405",
-    "gpt-4o": "gpt-4o",
-    "gemini-pro": "gemini-pro",
-    "gemini-1.5-flash": "gemini-1.5-flash",
-    "claude-sonnet-3.5": "claude-sonnet-3.5",
-    "PythonAgent": "PythonAgent",
-    "JavaAgent": "JavaAgent",
-    "JavaScriptAgent": "JavaScriptAgent",
-    "HTMLAgent": "HTMLAgent",
-    "GoogleCloudAgent": "GoogleCloudAgent",
-    "AndroidDeveloper": "AndroidDeveloper",
-    "SwiftDeveloper": "SwiftDeveloper",
-    "Next.jsAgent": "Next.jsAgent",
-    "MongoDBAgent": "MongoDBAgent",
-    "PyTorchAgent": "PyTorchAgent",
-    "ReactAgent": "ReactAgent",
-    "XcodeAgent": "XcodeAgent",
-    "AngularJSAgent": "AngularJSAgent",
-    "HerokuAgent": "HerokuAgent",
-    "GodotAgent": "GodotAgent",
-    "GoAgent": "GoAgent",
-    "GitlabAgent": "GitlabAgent",
-    "GitAgent": "GitAgent",
-    "RepoMap": "RepoMap",
-    # Additional mappings
-    "gemini-flash": "gemini-1.5-flash",
-    "claude-3.5-sonnet": "claude-sonnet-3.5",
-    "gemini-1.5-pro-latest": "gemini-pro",
-    "gemini-1.5-pro": "gemini-1.5-pro",
-    "claude-3-5-sonnet-20240620": "claude-sonnet-3.5",
-    "claude-3-5-sonnet": "claude-sonnet-3.5",
-    "Niansuh": "Niansuh",
-    "o1-preview": "o1-preview",
-    "claude-3-5-sonnet-20241022": "claude-3-5-sonnet-20241022",
-    "claude-3-5-sonnet-x": "claude-3-5-sonnet-x",
-
-    # Added New Agents
-    "FlaskAgent": "FlaskAgent",
-    "FirebaseAgent": "FirebaseAgent",
-    "FastAPIAgent": "FastAPIAgent",
-    "ErlangAgent": "ErlangAgent",
-    "ElectronAgent": "ElectronAgent",
-    "DockerAgent": "DockerAgent",
-    "DigitalOceanAgent": "DigitalOceanAgent",
-    "BitbucketAgent": "BitbucketAgent",
-    "AzureAgent": "AzureAgent",
-    "FlutterAgent": "FlutterAgent",
-    "YoutubeAgent": "YoutubeAgent",
-    "builderAgent": "builderAgent",
-}
-
-# Agent modes
-AGENT_MODE = {
-    'flux': {'mode': True, 'id': "ImageGenerationLV45LJp", 'name': "flux"},
-    'Niansuh': {'mode': True, 'id': "NiansuhAIk1HgESy", 'name': "Niansuh"},
-    'o1-preview': {'mode': True, 'id': "o1Dst8La8", 'name': "o1-preview"},
-    'claude-3-5-sonnet-20241022': {'mode': True, 'id': "Claude-Sonnet-3.5zO2HZSF", 'name': "claude-3-5-sonnet-20241022"},
-    'claude-3-5-sonnet-x': {'mode': True, 'id': "Claude-Sonnet-3.52022JE0UdQ3", 'name': "claude-3-5-sonnet-x"},
-}
-
-TRENDING_AGENT_MODE = {
-    "blackboxai": {},
-    "gemini-1.5-flash": {'mode': True, 'id': 'Gemini'},
-    "llama-3.1-8b": {'mode': True, 'id': "llama-3.1-8b"},
-    'llama-3.1-70b': {'mode': True, 'id': "llama-3.1-70b"},
-    'llama-3.1-405b': {'mode': True, 'id': "llama-3.1-405"},
-    'blackboxai-pro': {'mode': True, 'id': "BLACKBOXAI-PRO"},
-    'PythonAgent': {'mode': True, 'id': "Python Agent"},
-    'JavaAgent': {'mode': True, 'id': "Java Agent"},
-    'JavaScriptAgent': {'mode': True, 'id': "JavaScript Agent"},
-    'HTMLAgent': {'mode': True, 'id': "HTML Agent"},
-    'GoogleCloudAgent': {'mode': True, 'id': "Google Cloud Agent"},
-    'AndroidDeveloper': {'mode': True, 'id': "Android Developer"},
-    'SwiftDeveloper': {'mode': True, 'id': "Swift Developer"},
-    'Next.jsAgent': {'mode': True, 'id': "Next.js Agent"},
-    'MongoDBAgent': {'mode': True, 'id': "MongoDB Agent"},
-    'PyTorchAgent': {'mode': True, 'id': "PyTorch Agent"},
-    'ReactAgent': {'mode': True, 'id': "React Agent"},
-    'XcodeAgent': {'mode': True, 'id': "Xcode Agent"},
-    'AngularJSAgent': {'mode': True, 'id': "AngularJS Agent"},
-    'HerokuAgent': {'mode': True, 'id': "HerokuAgent"},
-    'GodotAgent': {'mode': True, 'id': "GodotAgent"},
-    'GoAgent': {'mode': True, 'id': "GoAgent"},
-    'GitlabAgent': {'mode': True, 'id': "GitlabAgent"},
-    'GitAgent': {'mode': True, 'id': "GitAgent"},
-    'RepoMap': {'mode': True, 'id': "repomap"},
-
-    # Added New Agents
-    'FlaskAgent': {'mode': True, 'id': "FlaskAgent"},
-    'FirebaseAgent': {'mode': True, 'id': "FirebaseAgent"},
-    'FastAPIAgent': {'mode': True, 'id': "FastAPIAgent"},
-    'ErlangAgent': {'mode': True, 'id': "ErlangAgent"},
-    'ElectronAgent': {'mode': True, 'id': "ElectronAgent"},
-    'DockerAgent': {'mode': True, 'id': "DockerAgent"},
-    'DigitalOceanAgent': {'mode': True, 'id': "DigitalOceanAgent"},
-    'BitbucketAgent': {'mode': True, 'id': "BitbucketAgent"},
-    'AzureAgent': {'mode': True, 'id': "AzureAgent"},
-    'FlutterAgent': {'mode': True, 'id': "FlutterAgent"},
-    'YoutubeAgent': {'mode': True, 'id': "YoutubeAgent"},
-    'builderAgent': {'mode': True, 'id': "builderAgent"},
-}
-
-# Model prefixes
-MODEL_PREFIXES = {
-    'gpt-4o': '@GPT-4o',
-    'gemini-pro': '@Gemini-PRO',
-    'claude-sonnet-3.5': '@Claude-Sonnet-3.5',
-    'PythonAgent': '@Python Agent',
-    'JavaAgent': '@Java Agent',
-    'JavaScriptAgent': '@JavaScript Agent',
-    'HTMLAgent': '@HTML Agent',
-    'GoogleCloudAgent': '@Google Cloud Agent',
-    'AndroidDeveloper': '@Android Developer',
-    'SwiftDeveloper': '@Swift Developer',
-    'Next.jsAgent': '@Next.js Agent',
-    'MongoDBAgent': '@MongoDB Agent',
-    'PyTorchAgent': '@PyTorch Agent',
-    'ReactAgent': '@React Agent',
-    'XcodeAgent': '@Xcode Agent',
-    'AngularJSAgent': '@AngularJS Agent',
-    'HerokuAgent': '@Heroku Agent',
-    'GodotAgent': '@Godot Agent',
-    'GoAgent': '@Go Agent',
-    'GitlabAgent': '@Gitlab Agent',
-    'GitAgent': '@Git Agent',
-    'blackboxai-pro': '@BLACKBOXAI-PRO',
-    'flux': '@Image Generation',
-
-    # Added New Agents
-    'FlaskAgent': '@Flask Agent',
-    'FirebaseAgent': '@Firebase Agent',
-    'FastAPIAgent': '@FastAPI Agent',
-    'ErlangAgent': '@Erlang Agent',
-    'ElectronAgent': '@Electron Agent',
-    'DockerAgent': '@Docker Agent',
-    'DigitalOceanAgent': '@DigitalOcean Agent',
-    'BitbucketAgent': '@Bitbucket Agent',
-    'AzureAgent': '@Azure Agent',
-    'FlutterAgent': '@Flutter Agent',
-    'YoutubeAgent': '@Youtube Agent',
-    'builderAgent': '@builder Agent',
-}
-
-# Model referers
-MODEL_REFERERS = {
-    "blackboxai": "/?model=blackboxai",
-    "gpt-4o": "/?model=gpt-4o",
-    "gemini-pro": "/?model=gemini-pro",
-    "claude-sonnet-3.5": "/?model=claude-sonnet-3.5",
-    # Add any additional referers if necessary
-}
+import os
+from dotenv import load_dotenv
+
+load_dotenv()
+
+# Base URL and Common Headers
+BASE_URL = "https://www.blackbox.ai"
+common_headers = {
+    'accept': '*/*',
+    'accept-language': 'en-US,en;q=0.9',
+    'cache-control': 'no-cache',
+    'origin': BASE_URL,
+    'pragma': 'no-cache',
+    'priority': 'u=1, i',
+    'sec-ch-ua': '"Google Chrome";v="131", "Chromium";v="131", "Not_A Brand";v="24"',
+    'sec-ch-ua-arch': '"x86"',
+    'sec-ch-ua-bitness': '"64"',
+    'sec-ch-ua-full-version': '"131.0.6778.69"',
+    'sec-ch-ua-full-version-list': '"Google Chrome";v="131.0.6778.69", "Chromium";v="131.0.6778.69", "Not_A Brand";v="24.0.0.0"',
+    'sec-ch-ua-mobile': '?0',
+    'sec-ch-ua-platform': '"Windows"',
+    'sec-ch-ua-platform-version': '"19.0.0"',
+    'sec-fetch-dest': 'empty',
+    'sec-fetch-mode': 'cors',
+    'sec-fetch-site': 'same-origin',
+    'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+}
+
+# Header Configurations for Specific API Calls
+def get_headers_api_chat(referer_url):
+    return {**common_headers, 'Content-Type': 'application/json', 'Referer': referer_url}
+
+def get_headers_chat(chat_url, next_action, next_router_state_tree):
+    return {
+        **common_headers,
+        'Accept': 'text/x-component',
+        'Content-Type': 'text/plain;charset=UTF-8',
+        'Referer': chat_url,
+        'next-action': next_action,
+        'next-router-state-tree': next_router_state_tree,
+        'next-url': '/',
+    }
+
+APP_SECRET = os.getenv("APP_SECRET")
+
+ALLOWED_MODELS = [
+    {"id": "blackboxai", "name": "blackboxai"},
+    {"id": "blackboxai-pro", "name": "blackboxai-pro"},
+    {"id": "flux", "name": "flux"},
+    {"id": "llama-3.1-8b", "name": "llama-3.1-8b"},
+    {"id": "llama-3.1-70b", "name": "llama-3.1-70b"},
+    {"id": "llama-3.1-405b", "name": "llama-3.1-405"},
+    {"id": "gpt-4o", "name": "gpt-4o"},
+    {"id": "gpt-4o-2024-05-13", "name": "gpt-4o"},
+    {"id": "gemini-pro", "name": "gemini-pro"},
+    {"id": "gemini-1.5-flash", "name": "gemini-1.5-flash"},
+    {"id": "claude-sonnet-3.5", "name": "claude-sonnet-3.5"},
+    {"id": "PythonAgent", "name": "python"},
+    {"id": "JavaAgent", "name": "java"},
+    {"id": "JavaScriptAgent", "name": "javascript"},
+    {"id": "HTMLAgent", "name": "html"},
+    {"id": "GoogleCloudAgent", "name": "googlecloud"},
+    {"id": "AndroidDeveloper", "name": "androiddeveloper"},
+    {"id": "SwiftDeveloper", "name": "swiftdeveloper"},
+    {"id": "Next.jsAgent", "name": "next.js"},
+    {"id": "MongoDBAgent", "name": "mongodb"},
+    {"id": "PyTorchAgent", "name": "pytorch"},
+    {"id": "ReactAgent", "name": "react"},
+    {"id": "XcodeAgent", "name": "xcode"},
+    {"id": "AngularJSAgent", "name": "angularjs"},
+    {"id": "HerokuAgent", "name": "heroku"},
+    {"id": "GodotAgent", "name": "godot"},
+    {"id": "GoAgent", "name": "go"},
+    {"id": "GitlabAgent", "name": "gitlab"},
+    {"id": "GitAgent", "name": "git"},
+    {"id": "RepoMap", "name": "repomap"},
+    {"id": "gemini-1.5-pro-latest", "name": "gemini-pro"},
+    {"id": "gemini-1.5-pro", "name": "gemini-1.5-pro"},
+    {"id": "claude-3-5-sonnet-20240620", "name": "claude-sonnet-3.5"},
+    {"id": "claude-3-5-sonnet", "name": "claude-sonnet-3.5"},
+    {"id": "Niansuh", "name": "niansuh"},
+    {"id": "o1-preview", "name": "o1-preview"},
+    {"id": "claude-3-5-sonnet-20241022", "name": "claude-3-5-sonnet-20241022"},
+    {"id": "claude-3-5-sonnet-x", "name": "claude-3-5-sonnet-x"},
+    {"id": "gpt-3.5-turbo", "name": "gpt-3.5-turbo"},
+
+    # Added New Agents
+    {"id": "FlaskAgent", "name": "flask"},
+    {"id": "FirebaseAgent", "name": "firebase"},
+    {"id": "FastAPIAgent", "name": "fastapi"},
+    {"id": "ErlangAgent", "name": "erlang"},
+    {"id": "ElectronAgent", "name": "electron"},
+    {"id": "DockerAgent", "name": "docker"},
+    {"id": "DigitalOceanAgent", "name": "digitalocean"},
+    {"id": "BitbucketAgent", "name": "bitbucket"},
+    {"id": "AzureAgent", "name": "azure"},
+    {"id": "FlutterAgent", "name": "flutter"},
+    {"id": "YoutubeAgent", "name": "youtube"},
+    {"id": "builderAgent", "name": "builder"},
+]
+
+MODEL_MAPPING = {
+    "blackboxai": "blackboxai",
+    "blackboxai-pro": "blackboxai-pro",
+    "flux": "flux",
+    "ImageGeneration": "flux",
+    "llama-3.1-8b": "llama-3.1-8b",
+    "llama-3.1-70b": "llama-3.1-70b",
+    "llama-3.1-405b": "llama-3.1-405",
+    "gpt-4o": "gpt-4o",
+    "gpt-4o-2024-05-13": "gpt-4o",
+    "gemini-pro": "gemini-pro",
+    "gemini-1.5-flash": "gemini-1.5-flash",
+    "claude-sonnet-3.5": "claude-sonnet-3.5",
+    "PythonAgent": "python",
+    "JavaAgent": "java",
+    "JavaScriptAgent": "javascript",
+    "HTMLAgent": "html",
+    "GoogleCloudAgent": "googlecloud",
+    "AndroidDeveloper": "androiddeveloper",
+    "SwiftDeveloper": "swiftdeveloper",
+    "Next.jsAgent": "next.js",
+    "MongoDBAgent": "mongodb",
+    "PyTorchAgent": "pytorch",
+    "ReactAgent": "react",
+    "XcodeAgent": "xcode",
+    "AngularJSAgent": "angularjs",
+    "HerokuAgent": "heroku",
+    "GodotAgent": "godot",
+    "GoAgent": "go",
+    "GitlabAgent": "gitlab",
+    "GitAgent": "git",
+    "RepoMap": "repomap",
+    # Additional mappings
+    "gemini-flash": "gemini-1.5-flash",
+    "claude-3.5-sonnet": "claude-sonnet-3.5",
+    "gemini-1.5-pro-latest": "gemini-pro",
+    "gemini-1.5-pro": "gemini-1.5-pro",
+    "claude-3-5-sonnet-20240620": "claude-sonnet-3.5",
+    "claude-3-5-sonnet": "claude-sonnet-3.5",
+    "Niansuh": "niansuh",
+    "o1-preview": "o1-preview",
+    "claude-3-5-sonnet-20241022": "claude-3-5-sonnet-20241022",
+    "claude-3-5-sonnet-x": "claude-3-5-sonnet-x",
+    "gpt-3.5-turbo": "gpt-3.5-turbo",
+
+    # Added New Agents
+    "FlaskAgent": "flask",
+    "FirebaseAgent": "firebase",
+    "FastAPIAgent": "fastapi",
+    "ErlangAgent": "erlang",
+    "ElectronAgent": "electron",
+    "DockerAgent": "docker",
+    "DigitalOceanAgent": "digitalocean",
+    "BitbucketAgent": "bitbucket",
+    "AzureAgent": "azure",
+    "FlutterAgent": "flutter",
+    "YoutubeAgent": "youtube",
+    "builderAgent": "builder",
+}
+
+# Agent modes
+AGENT_MODE = {
+    'flux': {'mode': True, 'id': "ImageGenerationLV45LJp", 'name': "flux"},
+    'Niansuh': {'mode': True, 'id': "NiansuhAIk1HgESy", 'name': "niansuh"},
+    'o1-preview': {'mode': True, 'id': "o1Dst8La8", 'name': "o1-preview"},
+    'claude-3-5-sonnet-20241022': {'mode': True, 'id': "Claude-Sonnet-3.5zO2HZSF", 'name': "claude-3-5-sonnet-20241022"},
+    'claude-3-5-sonnet-x': {'mode': True, 'id': "Claude-Sonnet-3.52022JE0UdQ3", 'name': "claude-3-5-sonnet-x"},
+    'gpt-3.5-turbo': {'mode': True, 'id': "GPT-3.5-TurboYxtGz0H", 'name': "gpt-3.5-turbo"},
+}
+
+TRENDING_AGENT_MODE = {
+    "blackboxai": {},
+    "gemini-1.5-flash": {'mode': True, 'id': 'gemini'},
+    "llama-3.1-8b": {'mode': True, 'id': "llama-3.1-8b"},
+    'llama-3.1-70b': {'mode': True, 'id': "llama-3.1-70b"},
+    'llama-3.1-405b': {'mode': True, 'id': "llama-3.1-405"},
+    'blackboxai-pro': {'mode': True, 'id': "blackboxai-pro"},
+    'PythonAgent': {'mode': True, 'id': "python"},
+    'JavaAgent': {'mode': True, 'id': "java"},
+    'JavaScriptAgent': {'mode': True, 'id': "javascript"},
+    'HTMLAgent': {'mode': True, 'id': "html"},
+    'GoogleCloudAgent': {'mode': True, 'id': "googlecloud"},
+    'AndroidDeveloper': {'mode': True, 'id': "android"},
+    'SwiftDeveloper': {'mode': True, 'id': "swift"},
+    'Next.jsAgent': {'mode': True, 'id': "next.js"},
+    'MongoDBAgent': {'mode': True, 'id': "mongodb"},
+    'PyTorchAgent': {'mode': True, 'id': "pytorch"},
+    'ReactAgent': {'mode': True, 'id': "react"},
+    'XcodeAgent': {'mode': True, 'id': "xcode"},
+    'AngularJSAgent': {'mode': True, 'id': "angularjs"},
+    'HerokuAgent': {'mode': True, 'id': "heroku"},
+    'GodotAgent': {'mode': True, 'id': "godot"},
+    'GoAgent': {'mode': True, 'id': "go"},
+    'GitlabAgent': {'mode': True, 'id': "gitlab"},
+    'GitAgent': {'mode': True, 'id': "git"},
+    'RepoMap': {'mode': True, 'id': "repomap"},
+    'FlaskAgent': {'mode': True, 'id': "flask"},
+    'FirebaseAgent': {'mode': True, 'id': "firebase"},
+    'FastAPIAgent': {'mode': True, 'id': "fastapi"},
+    'ErlangAgent': {'mode': True, 'id': "erlang"},
+    'ElectronAgent': {'mode': True, 'id': "electron"},
+    'DockerAgent': {'mode': True, 'id': "docker"},
+    'DigitalOceanAgent': {'mode': True, 'id': "digitalocean"},
+    'BitbucketAgent': {'mode': True, 'id': "bitbucket"},
+    'AzureAgent': {'mode': True, 'id': "azure"},
+    'FlutterAgent': {'mode': True, 'id': "flutter"},
+    'YoutubeAgent': {'mode': True, 'id': "youtube"},
+    'builderAgent': {'mode': True, 'id': "builder"},
+}
+
+# Model prefixes
+MODEL_PREFIXES = {
+    'gpt-4o': '@gpt-4o',
+    'gemini-pro': '@gemini-pro',
+    'claude-sonnet-3.5': '@claude-sonnet-3.5',
+    'PythonAgent': '@python',
+    'JavaAgent': '@java',
+    'JavaScriptAgent': '@javascript',
+    'HTMLAgent': '@html',
+    'GoogleCloudAgent': '@googlecloud',
+    'AndroidDeveloper': '@android',
+    'SwiftDeveloper': '@swift',
+    'Next.jsAgent': '@next.js',
+    'MongoDBAgent': '@mongodb',
+    'PyTorchAgent': '@pytorch',
+    'ReactAgent': '@react',
+    'XcodeAgent': '@xcode',
+    'AngularJSAgent': '@angularjs',
+    'HerokuAgent': '@heroku',
+    'GodotAgent': '@godot',
+    'GoAgent': '@go',
+    'GitlabAgent': '@gitlab',
+    'GitAgent': '@git',
+    'blackboxai-pro': '@blackboxai-pro',
+    'flux': '@Image Generation',
+    'FlaskAgent': '@flask',
+    'FirebaseAgent': '@firebase',
+    'FastAPIAgent': '@fastapi',
+    'ErlangAgent': '@erlang',
+    'ElectronAgent': '@electron',
+    'DockerAgent': '@docker',
+    'DigitalOceanAgent': '@digitalocean',
+    'BitbucketAgent': '@bitbucket',
+    'AzureAgent': '@azure',
+    'FlutterAgent': '@flutter',
+    'YoutubeAgent': '@youtube',
+    'builderAgent': '@builder',
+}
+
+# Model referers
+MODEL_REFERERS = {
+    "blackboxai": "/?model=blackboxai",
+    "gpt-4o": "/?model=gpt-4o",
+    "gemini-pro": "/?model=gemini-pro",
+    "claude-sonnet-3.5": "/?model=claude-sonnet-3.5",
+    "blackboxai-pro": "/?model=blackboxai-pro",
+}
+

api/utils.py

@@ -1,247 +1,247 @@
-from datetime import datetime
-import json
-import uuid
-import asyncio
-import random
-import string
-from typing import Any, Dict, Optional
-
-import httpx
-from fastapi import HTTPException
-from api.config import (
-    MODEL_MAPPING,
-    get_headers_api_chat,
-    get_headers_chat,
-    BASE_URL,
-    AGENT_MODE,
-    TRENDING_AGENT_MODE,
-    MODEL_PREFIXES,
-    MODEL_REFERERS
-)
-from api.models import ChatRequest
-from api.logger import setup_logger
-from api.validate import getHid  # Import the asynchronous getHid function
-
-logger = setup_logger(__name__)
-
-# Define the blocked message
-BLOCKED_MESSAGE = "Generated by BLACKBOX.AI, try unlimited chat https://www.blackbox.ai"
-
-# Helper function to create chat completion data
-def create_chat_completion_data(
-    content: str, model: str, timestamp: int, finish_reason: Optional[str] = None
-) -> Dict[str, Any]:
-    return {
-        "id": f"chatcmpl-{uuid.uuid4()}",
-        "object": "chat.completion.chunk",
-        "created": timestamp,
-        "model": model,
-        "choices": [
-            {
-                "index": 0,
-                "delta": {"content": content, "role": "assistant"},
-                "finish_reason": finish_reason,
-            }
-        ],
-        "usage": None,
-    }
-
-# Function to convert message to dictionary format, ensuring base64 data and optional model prefix
-def message_to_dict(message, model_prefix: Optional[str] = None):
-    content = message.content if isinstance(message.content, str) else message.content[0]["text"]
-    if model_prefix:
-        content = f"{model_prefix} {content}"
-    if isinstance(message.content, list) and len(message.content) == 2 and "image_url" in message.content[1]:
-        # Ensure base64 images are always included for all models
-        return {
-            "role": message.role,
-            "content": content,
-            "data": {
-                "imageBase64": message.content[1]["image_url"]["url"],
-                "fileText": "",
-                "title": "snapshot",
-            },
-        }
-    return {"role": message.role, "content": content}
-
-# Function to strip model prefix from content if present
-def strip_model_prefix(content: str, model_prefix: Optional[str] = None) -> str:
-    """Remove the model prefix from the response content if present."""
-    if model_prefix and content.startswith(model_prefix):
-        logger.debug(f"Stripping prefix '{model_prefix}' from content.")
-        return content[len(model_prefix):].strip()
-    return content
-
-# Process streaming response with headers from config.py
-async def process_streaming_response(request: ChatRequest):
-    # Generate a unique ID for this request
-    request_id = f"chatcmpl-{uuid.uuid4()}"
-    logger.info(f"Processing request with ID: {request_id} - Model: {request.model}")
-
-    agent_mode = AGENT_MODE.get(request.model, {})
-    trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
-    model_prefix = MODEL_PREFIXES.get(request.model, "")
-
-    # Adjust headers_api_chat since referer_url is removed
-    headers_api_chat = get_headers_api_chat(BASE_URL)
-
-    if request.model == 'o1-preview':
-        delay_seconds = random.randint(1, 60)
-        logger.info(f"Introducing a delay of {delay_seconds} seconds for model 'o1-preview' (Request ID: {request_id})")
-        await asyncio.sleep(delay_seconds)
-
-    # Fetch the h-value for the 'validated' field
-    h_value = await getHid()
-    if not h_value:
-        logger.error("Failed to retrieve h-value for validation.")
-        raise HTTPException(status_code=500, detail="Validation failed due to missing h-value.")
-
-    json_data = {
-        "agentMode": agent_mode,
-        "clickedAnswer2": False,
-        "clickedAnswer3": False,
-        "clickedForceWebSearch": False,
-        "codeModelMode": True,
-        "githubToken": None,
-        "id": None,  # Using request_id instead of chat_id
-        "isChromeExt": False,
-        "isMicMode": False,
-        "maxTokens": request.max_tokens,
-        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
-        "mobileClient": False,
-        "playgroundTemperature": request.temperature,
-        "playgroundTopP": request.top_p,
-        "previewToken": None,
-        "trendingAgentMode": trending_agent_mode,
-        "userId": None,
-        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
-        "userSystemPrompt": None,
-        "validated": h_value,  # Dynamically set the validated field
-        "visitFromDelta": False,
-    }
-
-    async with httpx.AsyncClient() as client:
-        try:
-            async with client.stream(
-                "POST",
-                f"{BASE_URL}/api/chat",
-                headers=headers_api_chat,
-                json=json_data,
-                timeout=100,
-            ) as response:
-                response.raise_for_status()
-                async for chunk in response.aiter_text():
-                    timestamp = int(datetime.now().timestamp())
-                    if chunk:
-                        content = chunk
-                        if content.startswith("$@$v=undefined-rv1$@$"):
-                            content = content[21:]
-                        # Remove the blocked message if present
-                        if BLOCKED_MESSAGE in content:
-                            logger.info(f"Blocked message detected in response for Request ID {request_id}.")
-                            content = content.replace(BLOCKED_MESSAGE, '').strip()
-                            if not content:
-                                continue  # Skip if content is empty after removal
-                        cleaned_content = strip_model_prefix(content, model_prefix)
-                        yield f"data: {json.dumps(create_chat_completion_data(cleaned_content, request.model, timestamp))}\n\n"
-
-                yield f"data: {json.dumps(create_chat_completion_data('', request.model, timestamp, 'stop'))}\n\n"
-                yield "data: [DONE]\n\n"
-        except httpx.HTTPStatusError as e:
-            logger.error(f"HTTP error occurred for Request ID {request_id}: {e}")
-            raise HTTPException(status_code=e.response.status_code, detail=str(e))
-        except httpx.RequestError as e:
-            logger.error(f"Error occurred during request for Request ID {request_id}: {e}")
-            raise HTTPException(status_code=500, detail=str(e))
-
-# Process non-streaming response with headers from config.py
-async def process_non_streaming_response(request: ChatRequest):
-    # Generate a unique ID for this request
-    request_id = f"chatcmpl-{uuid.uuid4()}"
-    logger.info(f"Processing request with ID: {request_id} - Model: {request.model}")
-
-    agent_mode = AGENT_MODE.get(request.model, {})
-    trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
-    model_prefix = MODEL_PREFIXES.get(request.model, "")
-
-    # Adjust headers_api_chat and headers_chat since referer_url is removed
-    headers_api_chat = get_headers_api_chat(BASE_URL)
-    headers_chat = get_headers_chat(BASE_URL, next_action=str(uuid.uuid4()), next_router_state_tree=json.dumps([""]))
-
-    if request.model == 'o1-preview':
-        delay_seconds = random.randint(20, 60)
-        logger.info(f"Introducing a delay of {delay_seconds} seconds for model 'o1-preview' (Request ID: {request_id})")
-        await asyncio.sleep(delay_seconds)
-
-    # Fetch the h-value for the 'validated' field
-    h_value = await getHid()
-    if not h_value:
-        logger.error("Failed to retrieve h-value for validation.")
-        raise HTTPException(status_code=500, detail="Validation failed due to missing h-value.")
-
-    json_data = {
-        "agentMode": agent_mode,
-        "clickedAnswer2": False,
-        "clickedAnswer3": False,
-        "clickedForceWebSearch": False,
-        "codeModelMode": True,
-        "githubToken": None,
-        "id": None,  # Using request_id instead of chat_id
-        "isChromeExt": False,
-        "isMicMode": False,
-        "maxTokens": request.max_tokens,
-        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
-        "mobileClient": False,
-        "playgroundTemperature": request.temperature,
-        "playgroundTopP": request.top_p,
-        "previewToken": None,
-        "trendingAgentMode": trending_agent_mode,
-        "userId": None,
-        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
-        "userSystemPrompt": None,
-        "validated": h_value,  # Dynamically set the validated field
-        "visitFromDelta": False,
-    }
-
-    full_response = ""
-    async with httpx.AsyncClient() as client:
-        try:
-            async with client.stream(
-                method="POST", url=f"{BASE_URL}/api/chat", headers=headers_api_chat, json=json_data
-            ) as response:
-                response.raise_for_status()
-                async for chunk in response.aiter_text():
-                    full_response += chunk
-        except httpx.HTTPStatusError as e:
-            logger.error(f"HTTP error occurred for Request ID {request_id}: {e}")
-            raise HTTPException(status_code=e.response.status_code, detail=str(e))
-        except httpx.RequestError as e:
-            logger.error(f"Error occurred during request for Request ID {request_id}: {e}")
-            raise HTTPException(status_code=500, detail=str(e))
-    
-    if full_response.startswith("$@$v=undefined-rv1$@$"):
-        full_response = full_response[21:]
-
-    # Remove the blocked message if present
-    if BLOCKED_MESSAGE in full_response:
-        logger.info(f"Blocked message detected in response for Request ID {request_id}.")
-        full_response = full_response.replace(BLOCKED_MESSAGE, '').strip()
-        if not full_response:
-            raise HTTPException(status_code=500, detail="Blocked message detected in response.")
-
-    cleaned_full_response = strip_model_prefix(full_response, model_prefix)
-
-    return {
-        "id": f"chatcmpl-{uuid.uuid4()}",
-        "object": "chat.completion",
-        "created": int(datetime.now().timestamp()),
-        "model": request.model,
-        "choices": [
-            {
-                "index": 0,
-                "message": {"role": "assistant", "content": cleaned_full_response},
-                "finish_reason": "stop",
-            }
-        ],
-        "usage": None,
-    }
+from datetime import datetime
+import json
+import uuid
+import asyncio
+import random
+import string
+from typing import Any, Dict, Optional
+
+import httpx
+from fastapi import HTTPException
+from api.config import (
+    MODEL_MAPPING,
+    get_headers_api_chat,
+    get_headers_chat,
+    BASE_URL,
+    AGENT_MODE,
+    TRENDING_AGENT_MODE,
+    MODEL_PREFIXES,
+    MODEL_REFERERS
+)
+from api.models import ChatRequest
+from api.logger import setup_logger
+from api.validate import getHid  # Import the asynchronous getHid function
+
+logger = setup_logger(__name__)
+
+# Define the blocked message
+BLOCKED_MESSAGE = "Generated by BLACKBOX.AI, try unlimited chat https://www.blackbox.ai"
+
+# Helper function to create chat completion data
+def create_chat_completion_data(
+    content: str, model: str, timestamp: int, finish_reason: Optional[str] = None
+) -> Dict[str, Any]:
+    return {
+        "id": f"chatcmpl-{uuid.uuid4()}",
+        "object": "chat.completion.chunk",
+        "created": timestamp,
+        "model": model,
+        "choices": [
+            {
+                "index": 0,
+                "delta": {"content": content, "role": "assistant"},
+                "finish_reason": finish_reason,
+            }
+        ],
+        "usage": None,
+    }
+
+# Function to convert message to dictionary format, ensuring base64 data and optional model prefix
+def message_to_dict(message, model_prefix: Optional[str] = None):
+    content = message.content if isinstance(message.content, str) else message.content[0]["text"]
+    if model_prefix:
+        content = f"{model_prefix} {content}"
+    if isinstance(message.content, list) and len(message.content) == 2 and "image_url" in message.content[1]:
+        # Ensure base64 images are always included for all models
+        return {
+            "role": message.role,
+            "content": content,
+            "data": {
+                "imageBase64": message.content[1]["image_url"]["url"],
+                "fileText": "",
+                "title": "snapshot",
+            },
+        }
+    return {"role": message.role, "content": content}
+
+# Function to strip model prefix from content if present
+def strip_model_prefix(content: str, model_prefix: Optional[str] = None) -> str:
+    """Remove the model prefix from the response content if present."""
+    if model_prefix and content.startswith(model_prefix):
+        logger.debug(f"Stripping prefix '{model_prefix}' from content.")
+        return content[len(model_prefix):].strip()
+    return content
+
+# Process streaming response with headers from config.py
+async def process_streaming_response(request: ChatRequest):
+    # Generate a unique ID for this request
+    request_id = f"chatcmpl-{uuid.uuid4()}"
+    logger.info(f"Processing request with ID: {request_id} - Model: {request.model}")
+
+    agent_mode = AGENT_MODE.get(request.model, {})
+    trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
+    model_prefix = MODEL_PREFIXES.get(request.model, "")
+
+    # Adjust headers_api_chat since referer_url is removed
+    headers_api_chat = get_headers_api_chat(BASE_URL)
+
+    if request.model == 'o1-preview':
+        delay_seconds = random.randint(1, 60)
+        logger.info(f"Introducing a delay of {delay_seconds} seconds for model 'o1-preview' (Request ID: {request_id})")
+        await asyncio.sleep(delay_seconds)
+
+    # Fetch the h-value for the 'validated' field
+    h_value = await getHid()
+    if not h_value:
+        logger.error("Failed to retrieve h-value for validation.")
+        raise HTTPException(status_code=500, detail="Validation failed due to missing h-value.")
+
+    json_data = {
+        "agentMode": agent_mode,
+        "clickedAnswer2": False,
+        "clickedAnswer3": False,
+        "clickedForceWebSearch": False,
+        "codeModelMode": True,
+        "githubToken": None,
+        "id": None,  # Using request_id instead of chat_id
+        "isChromeExt": False,
+        "isMicMode": False,
+        "maxTokens": request.max_tokens,
+        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
+        "mobileClient": False,
+        "playgroundTemperature": request.temperature,
+        "playgroundTopP": request.top_p,
+        "previewToken": None,
+        "trendingAgentMode": trending_agent_mode,
+        "userId": None,
+        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
+        "userSystemPrompt": None,
+        "validated": h_value,  # Dynamically set the validated field
+        "visitFromDelta": False,
+    }
+
+    async with httpx.AsyncClient() as client:
+        try:
+            async with client.stream(
+                "POST",
+                f"{BASE_URL}/api/chat",
+                headers=headers_api_chat,
+                json=json_data,
+                timeout=100,
+            ) as response:
+                response.raise_for_status()
+                async for chunk in response.aiter_text():
+                    timestamp = int(datetime.now().timestamp())
+                    if chunk:
+                        content = chunk
+                        if content.startswith("$@$v=undefined-rv1$@$"):
+                            content = content[21:]
+                        # Remove the blocked message if present
+                        if BLOCKED_MESSAGE in content:
+                            logger.info(f"Blocked message detected in response for Request ID {request_id}.")
+                            content = content.replace(BLOCKED_MESSAGE, '').strip()
+                            if not content:
+                                continue  # Skip if content is empty after removal
+                        cleaned_content = strip_model_prefix(content, model_prefix)
+                        yield f"data: {json.dumps(create_chat_completion_data(cleaned_content, request.model, timestamp))}\n\n"
+
+                yield f"data: {json.dumps(create_chat_completion_data('', request.model, timestamp, 'stop'))}\n\n"
+                yield "data: [DONE]\n\n"
+        except httpx.HTTPStatusError as e:
+            logger.error(f"HTTP error occurred for Request ID {request_id}: {e}")
+            raise HTTPException(status_code=e.response.status_code, detail=str(e))
+        except httpx.RequestError as e:
+            logger.error(f"Error occurred during request for Request ID {request_id}: {e}")
+            raise HTTPException(status_code=500, detail=str(e))
+
+# Process non-streaming response with headers from config.py
+async def process_non_streaming_response(request: ChatRequest):
+    # Generate a unique ID for this request
+    request_id = f"chatcmpl-{uuid.uuid4()}"
+    logger.info(f"Processing request with ID: {request_id} - Model: {request.model}")
+
+    agent_mode = AGENT_MODE.get(request.model, {})
+    trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
+    model_prefix = MODEL_PREFIXES.get(request.model, "")
+
+    # Adjust headers_api_chat and headers_chat since referer_url is removed
+    headers_api_chat = get_headers_api_chat(BASE_URL)
+    headers_chat = get_headers_chat(BASE_URL, next_action=str(uuid.uuid4()), next_router_state_tree=json.dumps([""]))
+
+    if request.model == 'o1-preview':
+        delay_seconds = random.randint(20, 60)
+        logger.info(f"Introducing a delay of {delay_seconds} seconds for model 'o1-preview' (Request ID: {request_id})")
+        await asyncio.sleep(delay_seconds)
+
+    # Fetch the h-value for the 'validated' field
+    h_value = await getHid()
+    if not h_value:
+        logger.error("Failed to retrieve h-value for validation.")
+        raise HTTPException(status_code=500, detail="Validation failed due to missing h-value.")
+
+    json_data = {
+        "agentMode": agent_mode,
+        "clickedAnswer2": False,
+        "clickedAnswer3": False,
+        "clickedForceWebSearch": False,
+        "codeModelMode": True,
+        "githubToken": None,
+        "id": None,  # Using request_id instead of chat_id
+        "isChromeExt": False,
+        "isMicMode": False,
+        "maxTokens": request.max_tokens,
+        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
+        "mobileClient": False,
+        "playgroundTemperature": request.temperature,
+        "playgroundTopP": request.top_p,
+        "previewToken": None,
+        "trendingAgentMode": trending_agent_mode,
+        "userId": None,
+        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
+        "userSystemPrompt": None,
+        "validated": h_value,  # Dynamically set the validated field
+        "visitFromDelta": False,
+    }
+
+    full_response = ""
+    async with httpx.AsyncClient() as client:
+        try:
+            async with client.stream(
+                method="POST", url=f"{BASE_URL}/api/chat", headers=headers_api_chat, json=json_data
+            ) as response:
+                response.raise_for_status()
+                async for chunk in response.aiter_text():
+                    full_response += chunk
+        except httpx.HTTPStatusError as e:
+            logger.error(f"HTTP error occurred for Request ID {request_id}: {e}")
+            raise HTTPException(status_code=e.response.status_code, detail=str(e))
+        except httpx.RequestError as e:
+            logger.error(f"Error occurred during request for Request ID {request_id}: {e}")
+            raise HTTPException(status_code=500, detail=str(e))
+    
+    if full_response.startswith("$@$v=undefined-rv1$@$"):
+        full_response = full_response[21:]
+
+    # Remove the blocked message if present
+    if BLOCKED_MESSAGE in full_response:
+        logger.info(f"Blocked message detected in response for Request ID {request_id}.")
+        full_response = full_response.replace(BLOCKED_MESSAGE, '').strip()
+        if not full_response:
+            raise HTTPException(status_code=500, detail="Blocked message detected in response.")
+
+    cleaned_full_response = strip_model_prefix(full_response, model_prefix)
+
+    return {
+        "id": f"chatcmpl-{uuid.uuid4()}",
+        "object": "chat.completion",
+        "created": int(datetime.now().timestamp()),
+        "model": request.model,
+        "choices": [
+            {
+                "index": 0,
+                "message": {"role": "assistant", "content": cleaned_full_response},
+                "finish_reason": "stop",
+            }
+        ],
+        "usage": None,
+    }

api/validate.py

@@ -1,26 +1,14 @@
+# api/validate.py
+
 import re
 import time
 import asyncio
-import aiohttp
-from typing import Optional
+import httpx
+from typing import Optional  # Added import for Optional
 
 base_url = "https://www.blackbox.ai"
 headers = {
-    'accept': '*/*',
-    'accept-language': 'en-US,en;q=0.9',
-    'cache-control': 'no-cache',
-    'content-type': 'application/json',
-    'origin': base_url,
-    'pragma': 'no-cache',
-    'priority': 'u=1, i',
-    'referer': f'{base_url}/',
-    'sec-ch-ua': '"Not?A_Brand";v="99", "Chromium";v="130"',
-    'sec-ch-ua-mobile': '?0',
-    'sec-ch-ua-platform': '"Linux"',
-    'sec-fetch-dest': 'empty',
-    'sec-fetch-mode': 'cors',
-    'sec-fetch-site': 'same-origin',
-    'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36'
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36"
 }
 
 # Cache variables
@@ -38,32 +26,45 @@ async def getHid(force_refresh: bool = False) -> Optional[str]:
         return cached_hid
 
     try:
-        async with aiohttp.ClientSession(headers=headers) as session:
-            async with session.get(base_url) as response:
-                if response.status != 200:
-                    print("Failed to load the page.")
-                    return None
+        async with httpx.AsyncClient() as client:
+            # Retrieve the initial HTML content.
+            response = await client.get(base_url, headers=headers)
+            response.raise_for_status()
+            content = response.text
+
+            # Use a regular expression to find specific `static/chunks` paths.
+            pattern = r"static/chunks/app/layout-[a-zA-Z0-9]+\.js"
+            match = re.search(pattern, content)
 
-                page_content = await response.text()
-                js_files = re.findall(r'static/chunks/\d{4}-[a-fA-F0-9]+\.js', page_content)
+            if match:
+                # Construct the full URL of the JS file.
+                js_path = match.group()
+                full_url = f"{base_url}/_next/{js_path}"
 
-                key_pattern = re.compile(r'w="([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})"')
+                # Request the content of the JS file.
+                js_response = await client.get(full_url, headers=headers)
+                js_response.raise_for_status()
 
-                for js_file in js_files:
-                    js_url = f"{base_url}/_next/{js_file}"
-                    async with session.get(js_url) as js_response:
-                        if js_response.status == 200:
-                            js_content = await js_response.text()
-                            match = key_pattern.search(js_content)
-                            if match:
-                                h_value = match.group(1)
-                                print("Found the h-value:", h_value)
-                                # Update the cache
-                                cached_hid = h_value
-                                cache_time = current_time
-                                return h_value
-                print("The h-value was not found in any JS content.")
+                # In JS content, use a regular expression to search for h-value.
+                h_pattern = r'h="([0-9a-f-]+)"'
+                h_match = re.search(h_pattern, js_response.text)
+
+                if h_match:
+                    h_value = h_match.group(1)
+                    print("Found the h-value:", h_value)
+                    # Update the cache.
+                    cached_hid = h_value
+                    cache_time = current_time
+                    return h_value
+                else:
+                    print("The h-value was not found in the JS content.")
+                    return None
+            else:
+                print("The specified JS file path was not found in the HTML content.")
                 return None
-    except Exception as e:
+    except httpx.RequestError as e:
         print(f"An error occurred during the request: {e}")
         return None
+    except httpx.HTTPStatusError as e:
+        print(f"HTTP error occurred: {e}")
+        return None

main.py

@@ -1,5 +1,5 @@
-import uvicorn
-from api.app import app
-
-if __name__ == "__main__":
-    uvicorn.run(app, host="0.0.0.0", port=8001)
+import uvicorn
+from api.app import app
+
+if __name__ == "__main__":
+    uvicorn.run(app, host="0.0.0.0", port=8001)

requirements.txt

@@ -1,5 +1,5 @@
-fastapi==0.95.2
-httpx==0.23.3
-pydantic==1.10.4
-python-dotenv==0.21.0
-uvicorn==0.21.1
+fastapi==0.95.2
+httpx==0.23.3
+pydantic==1.10.4
+python-dotenv==0.21.0
+uvicorn==0.21.1