dhisana 0.0.1.dev263__py3-none-any.whl → 0.0.1.dev265__py3-none-any.whl

dhisana/utils/enrich_lead_information.py

@@ -165,7 +165,7 @@ async def get_clean_lead_info_with_llm(lead_info_str: str, tool_config: Optional
         model="gpt-5.1-chat",
         tool_config=tool_config
     )
-    if status == "ERROR":
+    if status != "SUCCESS":
         return {}
     return lead_info.model_dump()
 

dhisana/utils/generate_email.py

@@ -12,6 +12,11 @@ from dhisana.utils.generate_structured_output_internal import (
 from datetime import datetime
 from pydantic import BaseModel, ConfigDict
 
+# ---------------------------------------------------------------------------------------
+# CONSTANTS
+# ---------------------------------------------------------------------------------------
+DEFAULT_OPENAI_MODEL = "gpt-4.1"
+
 # -----------------------------------------------------------------------------
 # Email Copy schema
 # -----------------------------------------------------------------------------
@@ -191,7 +196,7 @@ async def generate_personalized_email_copy(
             prompt=initial_prompt,
             response_format=EmailCopy,
             vector_store_id=vector_store_id,
-            model="gpt-5.1-chat",
+            model=DEFAULT_OPENAI_MODEL,
             tool_config=tool_config,
             use_cache=email_context.message_instructions.use_cache if email_context.message_instructions else True
         )
@@ -200,7 +205,7 @@ async def generate_personalized_email_copy(
         initial_response, initial_status = await get_structured_output_internal(
             prompt=initial_prompt,
             response_format=EmailCopy,
-            model="gpt-5.1-chat",
+            model=DEFAULT_OPENAI_MODEL,
             tool_config=tool_config,
             use_cache=email_context.message_instructions.use_cache if email_context.message_instructions else True
         )

dhisana/utils/generate_email_response.py

@@ -16,6 +16,11 @@ from dhisana.utils.generate_structured_output_internal import (
     get_structured_output_internal
 )
 
+# ---------------------------------------------------------------------------------------
+# CONSTANTS
+# ---------------------------------------------------------------------------------------
+DEFAULT_TRIAGE_MODEL = "gpt-4.1"
+
 # ---------------------------------------------------------------------------------------
 # MODEL
 # ---------------------------------------------------------------------------------------
@@ -194,7 +199,7 @@ async def get_inbound_email_triage_action(
         triage_only, status = await get_structured_output_with_assistant_and_vector_store(
             prompt=triage_prompt,
             response_format=InboundEmailTriageResponse,
-            model="gpt-5.1-chat",
+            model=DEFAULT_TRIAGE_MODEL,
             vector_store_id=cleaned_context.external_known_data.external_openai_vector_store_id,
             tool_config=tool_config,
             use_cache=cleaned_context.message_instructions.use_cache if cleaned_context.message_instructions else True
@@ -203,13 +208,28 @@ async def get_inbound_email_triage_action(
         triage_only, status = await get_structured_output_internal(
             prompt=triage_prompt,
             response_format=InboundEmailTriageResponse,
-            model="gpt-5.1-chat",
+            model=DEFAULT_TRIAGE_MODEL,
             tool_config=tool_config,
             use_cache=cleaned_context.message_instructions.use_cache if cleaned_context.message_instructions else True
         )
 
     if status != "SUCCESS":
-        raise Exception("Error in generating triage action.")
+        campaign_id = context.campaign_context.campaign_id if context.campaign_context else 'N/A'
+        if status == "CONTEXT_LENGTH_EXCEEDED":
+            raise Exception(
+                f"Email thread too long for model. Campaign ID: {campaign_id}. "
+                f"Consider truncating thread or switching models."
+            )
+        elif status in ("API_ERROR", "ERROR"):
+            raise Exception(
+                f"Error in generating triage action. Status: {status}. "
+                f"Campaign ID: {campaign_id}. Details: {triage_only}"
+            )
+        else:
+            raise Exception(
+                f"Error in generating triage action. Status: {status}. "
+                f"Campaign ID: {campaign_id}"
+            )
     return triage_only
 
 
@@ -393,7 +413,7 @@ async def generate_inbound_email_response_copy(
         initial_response, status = await get_structured_output_with_assistant_and_vector_store(
             prompt=prompt,
             response_format=InboundEmailTriageResponse,
-            model="gpt-5.1-chat",
+            model=DEFAULT_TRIAGE_MODEL,
             vector_store_id=cleaned_context.external_known_data.external_openai_vector_store_id,
             tool_config=tool_config
         )
@@ -401,12 +421,30 @@ async def generate_inbound_email_response_copy(
         initial_response, status = await get_structured_output_internal(
             prompt=prompt,
             response_format=InboundEmailTriageResponse,
-            model="gpt-5.1-chat",
+            model=DEFAULT_TRIAGE_MODEL,
             tool_config=tool_config
         )
 
     if status != "SUCCESS":
-        raise Exception("Error in generating the inbound email triage response.")
+        campaign_id = (
+            campaign_context.campaign_context.campaign_id 
+            if campaign_context.campaign_context else 'N/A'
+        )
+        if status == "CONTEXT_LENGTH_EXCEEDED":
+            raise Exception(
+                f"Email thread too long for model. Campaign ID: {campaign_id}. "
+                f"Consider truncating thread or switching models."
+            )
+        elif status in ("API_ERROR", "ERROR"):
+            raise Exception(
+                f"Error in generating inbound email triage response. Status: {status}. "
+                f"Campaign ID: {campaign_id}. Details: {initial_response}"
+            )
+        else:
+            raise Exception(
+                f"Error in generating inbound email triage response. Status: {status}. "
+                f"Campaign ID: {campaign_id}"
+            )
 
     response_item = MessageItem(
         message_id="",  # or generate one if appropriate

dhisana/utils/generate_leads_salesnav.py

@@ -215,6 +215,8 @@ async def generate_leads_code(
     )
 
     # Return dict + status
+    if status != "SUCCESS":
+        return {"workflow_python_code": ""}, status
     return response.model_dump(), status
 
 

dhisana/utils/generate_linkedin_connect_message.py

@@ -21,6 +21,12 @@ from dhisana.utils.generate_structured_output_internal import (
 )
 from dhisana.utils.assistant_tool_tag import assistant_tool
 
+# ---------------------------------------------------------------------------------------
+# CONSTANTS
+# ---------------------------------------------------------------------------------------
+DEFAULT_OPENAI_MODEL = "gpt-4.1"
+
+
 # ----------------------------------------------------------------------
 # LinkedIn Connection Message Schema
 # ----------------------------------------------------------------------
@@ -151,7 +157,7 @@ async def generate_personalized_linkedin_copy(
             prompt=prompt,
             response_format=LinkedInConnectMessage,
             vector_store_id=vector_store_id,
-            model="gpt-5.1-chat",
+            model=DEFAULT_OPENAI_MODEL,
             tool_config=tool_config,
             use_cache=linkedin_context.message_instructions.use_cache if linkedin_context.message_instructions else True
         )
@@ -160,7 +166,7 @@ async def generate_personalized_linkedin_copy(
         response_data, status = await get_structured_output_internal(
             prompt=prompt,
             response_format=LinkedInConnectMessage,
-            model="gpt-5.1-chat",
+            model=DEFAULT_OPENAI_MODEL,
             tool_config=tool_config,
             use_cache=linkedin_context.message_instructions.use_cache if linkedin_context.message_instructions else True
         )

dhisana/utils/generate_structured_output_internal.py

@@ -3,6 +3,7 @@ import hashlib
 import json
 import logging
 import random
+from typing import Any, Dict, List, Optional, Tuple, Union
 
 from fastapi import HTTPException
 from pydantic import BaseModel
@@ -17,11 +18,16 @@ from dhisana.utils.fetch_openai_config import (
     _extract_config,
     create_async_openai_client,
 )
-from typing import Any, Dict, List, Optional, Tuple, Union
 
-from openai import OpenAIError, RateLimitError
-from pydantic import BaseModel
 
+# ──────────────────────────────────────────────────────────────────────────────
+# 1.  Helper functions
+# ──────────────────────────────────────────────────────────────────────────────
+
+def is_context_length_error(error: Exception) -> bool:
+    """Check if an error is due to context length being exceeded."""
+    error_str = str(error).lower()
+    return "context_length_exceeded" in error_str or "context window" in error_str
 
 
 # ──────────────────────────────────────────────────────────────────────────────
@@ -144,11 +150,17 @@ async def get_structured_output_internal(
                 completion = await _make_request()
                 break  # success → exit loop
             except (RateLimitError, OpenAIError) as e:
+                # Check for context length exceeded error
+                if is_context_length_error(e):
+                    logging.error(f"Context length exceeded: {e}")
+                    return f"Context length exceeded: {str(e)}", "CONTEXT_LENGTH_EXCEEDED"
+                
                 # Detect 429 / rate-limit
+                error_str = str(e).lower()
                 is_rl = (
                     isinstance(e, RateLimitError)
                     or getattr(e, "status_code", None) == 429
-                    or "rate_limit" in str(e).lower()
+                    or "rate_limit" in error_str
                 )
                 if is_rl and attempt < max_retries:
                     attempt += 1
@@ -161,7 +173,7 @@ async def get_structured_output_internal(
                     await asyncio.sleep(wait_time)
                     continue  # retry once
                 logging.error(f"OpenAI API error: {e}")
-                raise HTTPException(status_code=502, detail="Error communicating with the OpenAI API.")
+                return f"OpenAI API error: {str(e)}", "API_ERROR"
 
         # ─── handle model output (unchanged) ────────────────────────────────
         if completion and completion.output and len(completion.output) > 0:
@@ -203,12 +215,15 @@ async def get_structured_output_internal(
         else:
             return "No output returned", "FAIL"
 
+    # Safety fallback: catch any OpenAI errors not caught by inner retry loop
     except OpenAIError as e:
         logging.error(f"OpenAI API error: {e}")
-        raise HTTPException(status_code=502, detail="Error communicating with the OpenAI API.")
+        if is_context_length_error(e):
+            return f"Context length exceeded: {str(e)}", "CONTEXT_LENGTH_EXCEEDED"
+        return f"OpenAI API error: {str(e)}", "API_ERROR"
     except Exception as e:
         logging.error(f"Unexpected error: {e}")
-        raise HTTPException(status_code=500, detail="Unexpected server error.")
+        return f"Unexpected error: {str(e)}", "ERROR"
 
 
 
@@ -293,11 +308,17 @@ async def get_structured_output_with_mcp(
         return await client_async.responses.create(**kwargs)
 
     # ─── Retry once for 429s ──────────────────────────────────────────────────
+    completion = None
     for attempt in range(2):
         try:
             completion = await _make_request()
             break
         except (RateLimitError, OpenAIError) as exc:
+            # Check for context length exceeded error
+            if is_context_length_error(exc):
+                logging.error(f"Context length exceeded: {exc}")
+                return f"Context length exceeded: {str(exc)}", "CONTEXT_LENGTH_EXCEEDED"
+            
             if attempt == 0 and (
                 isinstance(exc, RateLimitError)
                 or getattr(exc, "status_code", None) == 429
@@ -308,9 +329,10 @@ async def get_structured_output_with_mcp(
                 await asyncio.sleep(sleep_for)
                 continue
             logging.error("OpenAI API error: %s", exc)
-            raise HTTPException(502, detail="Error communicating with the OpenAI API.") from exc
-    else:  # pragma: no cover
-        raise HTTPException(502, detail="OpenAI request retry loop failed.")
+            return f"OpenAI API error: {str(exc)}", "API_ERROR"
+    
+    if not completion:
+        return "OpenAI request retry loop failed", "API_ERROR"
 
     # ─── Parse the model’s structured output ──────────────────────────────────
     if not (completion and completion.output):
@@ -438,7 +460,7 @@ async def get_structured_output_with_assistant_and_vector_store(
                     break
 
             if not raw_text or not raw_text.strip():
-                raise HTTPException(status_code=502, detail="No response from the model.")
+                return "No response from the model", "FAIL"
 
             try:
                 parsed_obj = response_format.parse_raw(raw_text)
@@ -454,9 +476,12 @@ async def get_structured_output_with_assistant_and_vector_store(
         else:
             return "No output returned", "FAIL"
 
+    # Safety fallback: catch any errors not caught during API call
     except OpenAIError as e:
         logging.error(f"OpenAI API error: {e}")
-        raise HTTPException(status_code=502, detail="Error communicating with the OpenAI API.")
+        if is_context_length_error(e):
+            return f"Context length exceeded: {str(e)}", "CONTEXT_LENGTH_EXCEEDED"
+        return f"OpenAI API error: {str(e)}", "API_ERROR"
     except Exception as e:
         logging.error(f"Unexpected error: {e}")
-        raise HTTPException(status_code=500, detail="Unexpected server error.")
+        return f"Unexpected error: {str(e)}", "ERROR"

{dhisana-0.0.1.dev263.dist-info → dhisana-0.0.1.dev265.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dhisana
-Version: 0.0.1.dev263
+Version: 0.0.1.dev265
 Summary: A Python SDK for Dhisana AI Platform
 Home-page: https://github.com/dhisana-ai/dhisana-python-sdk
 Author: Admin

{dhisana-0.0.1.dev263.dist-info → dhisana-0.0.1.dev265.dist-info}/RECORD

@@ -32,20 +32,20 @@ dhisana/utils/domain_parser.py,sha256=Kw5MPP06wK2azWQzuSiOE-DffOezLqDyF-L9JEBsMS
 dhisana/utils/email_body_utils.py,sha256=rlCVjdBlqNnEiUberJGXGcrYY1GQOkW0-aB6AEpS3L4,2302
 dhisana/utils/email_parse_helpers.py,sha256=LIdm1B1IyGSW50y8EkxOk6YRjvxO2SJTgTKPLxYls_o,4613
 dhisana/utils/email_provider.py,sha256=spjbNdnaVfCZEUw62EEHKijuXjI7vTVNqsftxJ15Erw,14352
-dhisana/utils/enrich_lead_information.py,sha256=F6nn9W-yUi4buJZ3EI21IncvaJExKkYu1WHtaKkFFWs,39409
+dhisana/utils/enrich_lead_information.py,sha256=O0fV-8MlXFT_z5aXvmvXVT76AISN94GpvAOlq3q_Phw,39411
 dhisana/utils/extract_email_content_for_llm.py,sha256=SQmMZ3YJtm3ZI44XiWEVAItcAwrsSSy1QzDne7LTu_Q,3713
 dhisana/utils/fetch_openai_config.py,sha256=LjWdFuUeTNeAW106pb7DLXZNElos2PlmXRe6bHZJ2hw,5159
 dhisana/utils/field_validators.py,sha256=BZgNCpBG264aRqNUu_J67c6zfr15zlAaIw2XRy8J7DY,11809
 dhisana/utils/g2_tools.py,sha256=a4vmBYCBvLae5CdpOhMN1oNlvO8v9J1B5Sd8T5PzuU8,3346
 dhisana/utils/generate_content.py,sha256=kkf-aPuA32BNgwk_j5N6unYHOZpO7zIfO6zP95XM9fA,2298
 dhisana/utils/generate_custom_message.py,sha256=tQsryytoYKP5uF3bRENeZks1LvOMFCP6L1487P_r_hk,12072
-dhisana/utils/generate_email.py,sha256=FtzrqGwv0n6enHSF12RnviCC013zRV4Bjaq6jx_fldQ,12979
-dhisana/utils/generate_email_response.py,sha256=nGjIZp3PMWF2lMWJ7HIEAuF-mlyQGbEXJcyQGExB-KI,19504
+dhisana/utils/generate_email.py,sha256=Qufol-qgOk8loNulZ6hMzIRr45Ml7JwJpLO5OMabbH8,13217
+dhisana/utils/generate_email_response.py,sha256=Xk6t2hW_QbumvXf5uUdsD-Lkq8hfzRD9QWioYcdWM1k,21194
 dhisana/utils/generate_flow.py,sha256=QMn6bWo0nH0fBvy2Ebub1XfH5udnVAqsPsbIqCtQPXU,4728
-dhisana/utils/generate_leads_salesnav.py,sha256=AONP1KXDJdg95JQBmKx5PQXUD2BHctc-MZOMuRfuK9U,12156
-dhisana/utils/generate_linkedin_connect_message.py,sha256=Y71eVZ5EwE7e2S1qrJsLsYzecDC-9Fymj6RYLyVB0ys,9969
+dhisana/utils/generate_leads_salesnav.py,sha256=FG7q6GSm9IywZ9TgQnn5_N3QNfiI-Qk2gaO_3GS99nY,12236
+dhisana/utils/generate_linkedin_connect_message.py,sha256=QxsxDiT-3eQOqAAbW13d0HGJXV36WYPvC-7Zsw_2VTI,10208
 dhisana/utils/generate_linkedin_response_message.py,sha256=mWoSs5p2JSTIoFZFGm86x1kgs67J7dHPvGKZPzcdGdU,14569
-dhisana/utils/generate_structured_output_internal.py,sha256=DmZ5QzW-79Jo3JL5nDCZQ-Fjl8Nz7FHK6S0rZxXbKyg,20705
+dhisana/utils/generate_structured_output_internal.py,sha256=k6w5zaaMigp7cUgFALr-TRBsoEQTlzyGfH4R8HIIfGU,22116
 dhisana/utils/google_custom_search.py,sha256=5rQ4uAF-hjFpd9ooJkd6CjRvSmhZHhqM0jfHItsbpzk,10071
 dhisana/utils/google_oauth_tools.py,sha256=ReG5lCpXL3_e_s0yn6ai4U7B4-feOWHJVtbv_c0g0rE,28525
 dhisana/utils/google_workspace_tools.py,sha256=fuV0UcvAqF9drLzj7-p6D5zh7d5jMXl1jNJTICk4XOo,50224
@@ -95,8 +95,8 @@ dhisana/workflow/agent.py,sha256=esv7_i_XuMkV2j1nz_UlsHov_m6X5WZZiZm_tG4OBHU,565
 dhisana/workflow/flow.py,sha256=xWE3qQbM7j2B3FH8XnY3zOL_QXX4LbTW4ArndnEYJE0,1638
 dhisana/workflow/task.py,sha256=HlWz9mtrwLYByoSnePOemBUBrMEcj7KbgNjEE1oF5wo,1830
 dhisana/workflow/test.py,sha256=E7lRnXK0PguTNzyasHytLzTJdkqIPxG5_4qk4hMEeKc,3399
-dhisana-0.0.1.dev263.dist-info/METADATA,sha256=bXLyYLDa5vvAlz7vpCbBYdBIv5-1s8XLbO-HGAnZFRA,1190
-dhisana-0.0.1.dev263.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dhisana-0.0.1.dev263.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
-dhisana-0.0.1.dev263.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
-dhisana-0.0.1.dev263.dist-info/RECORD,,
+dhisana-0.0.1.dev265.dist-info/METADATA,sha256=S6o7HBV1UGxYP3ltCxcwGEYDhpQ5VsZ_sEUXvf_cIcY,1190
+dhisana-0.0.1.dev265.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dhisana-0.0.1.dev265.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
+dhisana-0.0.1.dev265.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
+dhisana-0.0.1.dev265.dist-info/RECORD,,