Update api/utils.py

api/utils.py

@@ -18,12 +18,10 @@ from api.config import (
 )
 from api.models import ChatRequest, Message
 from api.logger import setup_logger
+from api.providers.gizai import GizAI  # Import the GizAI provider
 
 logger = setup_logger(__name__)
 
-# Editee API endpoint
-EDITE_API_ENDPOINT = "https://editee.com/submit/chatgptfree"
-
 # Helper function to create a random alphanumeric chat ID
 def generate_chat_id(length: int = 7) -> str:
     characters = string.ascii_letters + string.digits
@@ -70,21 +68,6 @@ def message_to_dict(message: Message):
         }
     return {"role": message.role, "content": content}
 
-# Function to strip model prefix from content if present (Removed as MODEL_PREFIXES is removed)
-# 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
-
-# Function to get the correct referer URL for logging (Removed as MODEL_REFERERS is removed)
-# def get_referer_url(chat_id: str, model: str) -> str:
-#     """Generate the referer URL based on specific models listed in MODEL_REFERERS."""
-#     if model in MODEL_REFERERS:
-#         return f"{BASE_URL}/chat/{chat_id}?model={model}"
-#     return BASE_URL
-
 # Function to resolve model aliases
 def resolve_model(model: str) -> str:
     if model in MODEL_MAPPING:
@@ -92,118 +75,78 @@ def resolve_model(model: str) -> str:
     elif model in model_aliases:
         return model_aliases[model]
     else:
-        logger.warning(f"Model '{model}' not recognized. Using default model '{default_model}'.")
-        return "claude"  # default_model
+        logger.warning(f"Model '{model}' not recognized. Using default model '{GizAI.default_model}'.")
+        return GizAI.default_model  # default_model
 
-# Process streaming response with headers from config.py
+# Process streaming response with GizAI provider
 async def process_streaming_response(request: ChatRequest) -> AsyncGenerator[str, None]:
     chat_id = generate_chat_id()
     resolved_model = resolve_model(request.model)
-    # referer_url = get_referer_url(chat_id, resolved_model)  # Removed
     logger.info(f"Generated Chat ID: {chat_id} - Model: {resolved_model}")
 
-    # model_prefix = MODEL_PREFIXES.get(resolved_model, "")  # Removed
-
-    headers_api_chat = get_headers_api_chat(BASE_URL)  # Using BASE_URL as referer
-
-    # Removed agent mode and delay logic
-
-    prompt = format_prompt(request.messages)
-    data = {
-        "user_input": prompt,
-        "context": " ",
-        "template_id": "",
-        "selected_model": resolved_model
-    }
-
-    async with httpx.AsyncClient() as client:
-        try:
-            response = await client.post(
-                EDITE_API_ENDPOINT,
-                headers=headers_api_chat,
-                json=data,
-                timeout=100,
-            )
-            response.raise_for_status()
-            response_data = response.json()
-            # Assuming response_data contains 'text' field
-            text = response_data.get('text', '')
-            timestamp = int(datetime.now().timestamp())
-            if text:
-                # cleaned_content = strip_model_prefix(text, model_prefix)  # Removed
-                yield f"data: {json.dumps(create_chat_completion_data(text, resolved_model, timestamp))}\n\n"
-
-            # Indicate completion
-            yield f"data: {json.dumps(create_chat_completion_data('', resolved_model, timestamp, 'stop'))}\n\n"
-            yield "data: [DONE]\n\n"
-        except httpx.HTTPStatusError as e:
-            logger.error(f"HTTP error occurred for Chat ID {chat_id}: {e.response.status_code} - {e.response.text}")
-            raise HTTPException(status_code=e.response.status_code, detail=str(e))
-        except httpx.RequestError as e:
-            logger.error(f"Request error occurred for Chat ID {chat_id}: {e}")
-            raise HTTPException(status_code=500, detail=str(e))
-
-# Process non-streaming response with headers from config.py
+    # Instantiate the GizAI provider
+    gizai_provider = GizAI()
+
+    # Create the async generator
+    async for response in gizai_provider.create_async_generator(
+        model=resolved_model,
+        messages=request.messages,
+        proxy=request.proxy  # Assuming 'proxy' is part of ChatRequest; if not, adjust accordingly
+    ):
+        timestamp = int(datetime.now().timestamp())
+        if isinstance(response, ImageResponse):
+            # Handle image responses
+            yield f"data: {json.dumps({'image_url': response.images, 'alt': response.alt})}\n\n"
+        else:
+            # Handle text responses
+            yield f"data: {json.dumps(create_chat_completion_data(response, resolved_model, timestamp))}\n\n"
+
+    # Indicate completion
+    timestamp = int(datetime.now().timestamp())
+    yield f"data: {json.dumps(create_chat_completion_data('', resolved_model, timestamp, 'stop'))}\n\n"
+    yield "data: [DONE]\n\n"
+
+# Process non-streaming response with GizAI provider
 async def process_non_streaming_response(request: ChatRequest) -> Dict[str, Any]:
     chat_id = generate_chat_id()
     resolved_model = resolve_model(request.model)
-    # referer_url = get_referer_url(chat_id, resolved_model)  # Removed
     logger.info(f"Generated Chat ID: {chat_id} - Model: {resolved_model}")
 
-    # model_prefix = MODEL_PREFIXES.get(resolved_model, "")  # Removed
-
-    headers_api_chat = get_headers_api_chat(BASE_URL)  # Using BASE_URL as referer
+    # Instantiate the GizAI provider
+    gizai_provider = GizAI()
+
+    # Collect the responses
+    responses = []
+    async for response in gizai_provider.create_async_generator(
+        model=resolved_model,
+        messages=request.messages,
+        proxy=request.proxy  # Assuming 'proxy' is part of ChatRequest; if not, adjust accordingly
+    ):
+        if isinstance(response, ImageResponse):
+            # For image responses, collect image URLs
+            responses.append({"image_url": response.images, "alt": response.alt})
+        else:
+            # For text responses, append the text
+            responses.append(response)
 
-    # Removed agent mode and delay logic
-
-    prompt = format_prompt(request.messages)
-    data = {
-        "user_input": prompt,
-        "context": " ",
-        "template_id": "",
-        "selected_model": resolved_model
-    }
-
-    async with httpx.AsyncClient() as client:
-        try:
-            response = await client.post(
-                EDITE_API_ENDPOINT,
-                headers=headers_api_chat,
-                json=data,
-                timeout=100,
-            )
-            response.raise_for_status()
-            response_data = response.json()
-            text = response_data.get('text', '')
-            # if text.startswith("$@$v=undefined-rv1$@$"):
-            #     text = text[21:]  # Removed
-
-            # cleaned_full_response = strip_model_prefix(text, model_prefix)  # Removed
-
-            return {
-                "id": f"chatcmpl-{uuid.uuid4()}",
-                "object": "chat.completion",
-                "created": int(datetime.now().timestamp()),
-                "model": resolved_model,
-                "choices": [
-                    {
-                        "index": 0,
-                        "message": {"role": "assistant", "content": text},
-                        "finish_reason": "stop",
-                    }
-                ],
-                "usage": None,
+    return {
+        "id": f"chatcmpl-{uuid.uuid4()}",
+        "object": "chat.completion",
+        "created": int(datetime.now().timestamp()),
+        "model": resolved_model,
+        "choices": [
+            {
+                "index": 0,
+                "message": {"role": "assistant", "content": responses},
+                "finish_reason": "stop",
             }
-        except httpx.HTTPStatusError as e:
-            logger.error(f"HTTP error occurred for Chat ID {chat_id}: {e.response.status_code} - {e.response.text}")
-            raise HTTPException(status_code=e.response.status_code, detail=str(e))
-        except httpx.RequestError as e:
-            logger.error(f"Request error occurred for Chat ID {chat_id}: {e}")
-            raise HTTPException(status_code=500, detail=str(e))
+        ],
+        "usage": None,
+    }
 
 # Helper function to format prompt from messages
 def format_prompt(messages: list[Message]) -> str:
-    # Implement the prompt formatting as per Editee's requirements
+    # Implement the prompt formatting as per GizAI's requirements
     # Placeholder implementation
     formatted_messages = []
     for msg in messages: