dhisana 0.0.1.dev30__tar.gz → 0.0.1.dev32__tar.gz

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/PKG-INFO

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

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='dhisana',  
-    version='0.0.1-dev30',
+    version='0.0.1-dev32',
     description='A Python SDK for Dhisana AI Platform',
     author='Admin',
     author_email='contact@dhisana.ai',

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/src/dhisana/utils/cache_output_tools.py

@@ -16,6 +16,7 @@ CONTAINER_NAME = "cacheoutputs"
 
 # Initialize the BlobServiceClient
 blob_service_client = BlobServiceClient.from_connection_string(AZURE_BLOB_CONNECTION_STRING)
+logging.getLogger("azure").setLevel(logging.CRITICAL)
 
 # Ensure the container exists (if it already exists, an error is caught and ignored)
 try:

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/src/dhisana/utils/check_for_intent_signal.py

@@ -2,7 +2,7 @@ import logging
 from typing import Any, Dict, List, Optional, cast
 
 from pydantic import BaseModel
-from dhisana.utils.generate_structured_output_internal import get_structured_output_with_o1
+from dhisana.utils.generate_structured_output_internal import get_structured_output_internal
 from dhisana.utils.compose_search_query import (
     generate_google_search_queries,
     get_search_results_for_insights
@@ -72,7 +72,7 @@ async def check_for_intent_signal(
     logger.info("Scoring intent signal '%s' for lead: %s", intent_signal_type, lead.get("full_name", "Unknown"))
 
     # The helper returns (model_instance or None, status_str)
-    response_any, status = await get_structured_output_with_o1(
+    response_any, status = await get_structured_output_internal(
         user_prompt,
         IntentSignalScoring,
         tool_config=tool_config

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/src/dhisana/utils/compose_cadence.py

@@ -4,7 +4,7 @@ from typing import Any, Dict, List, Optional, Tuple
 
 from pydantic import BaseModel
 
-from dhisana.utils.generate_structured_output_internal import get_structured_output_with_o1
+from dhisana.utils.generate_structured_output_internal import get_structured_output_internal
 from dhisana.utils.workflow_code_model import WorkflowPythonCode
 
 # Initialize logger
@@ -132,7 +132,7 @@ async def generate_code_for_campaign_cadence(
       "workflow_python_code": "<the python code here>"
     }}
     """
-    response, status = await get_structured_output_with_o1(
+    response, status = await get_structured_output_internal(
         user_prompt, WorkflowPythonCode, tool_config=tool_config
     )
     return response.model_dump(), status

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/src/dhisana/utils/compose_salesnav_query.py

@@ -2,10 +2,10 @@ import logging
 import os
 from typing import Any, Dict, List, Optional
 
-import openai  # Remove if not required outside get_structured_output_with_o1
+import openai  # Remove if not required outside get_structured_output_internal
 from pydantic import BaseModel
 
-from dhisana.utils.generate_structured_output_internal import get_structured_output_with_o1
+from dhisana.utils.generate_structured_output_internal import get_structured_output_internal
 
 logger = logging.getLogger(__name__)
 logging.basicConfig(level=logging.INFO)
@@ -27,7 +27,7 @@ async def generate_salesnav_people_search_url(
     Generate a single LinkedIn Sales Navigator URL based on the user's plain-English
     description of filters and parameters or a provided Sales Navigator URL.
 
-    This function leverages an LLM (via get_structured_output_with_o1) to parse
+    This function leverages an LLM (via get_structured_output_internal) to parse
     the user's requirements (e.g., connection degree, seniority, region, etc.)
     and build a properly encoded Sales Navigator people-search URL.
 
@@ -247,7 +247,7 @@ async def generate_salesnav_people_search_url(
     logger.info("Generating Sales Navigator people-search URL from description: '%s'", english_description)
 
     # 3. Call your structured-output helper
-    response, status = await get_structured_output_with_o1(
+    response, status = await get_structured_output_internal(
         user_prompt,
         SalesNavQuery,
         tool_config=tool_config

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/src/dhisana/utils/compose_search_query.py

@@ -6,7 +6,7 @@ from typing import Any, Dict, List, Optional
 import aiohttp
 from pydantic import BaseModel
 
-from dhisana.utils.generate_structured_output_internal import get_structured_output_with_o1
+from dhisana.utils.generate_structured_output_internal import get_structured_output_internal
 from dhisana.utils.cache_output_tools import cache_output, retrieve_output
 
 logger = logging.getLogger(__name__)
@@ -101,7 +101,7 @@ async def generate_google_search_queries(
     logger.info("Generating Google search queries from description: %s", english_description)
 
     # Call your structured-output helper
-    response, status = await get_structured_output_with_o1(
+    response, status = await get_structured_output_internal(
         user_prompt,
         GoogleSearchQuery,
         tool_config=tool_config

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/src/dhisana/utils/compose_three_step_workflow.py

@@ -4,7 +4,7 @@ from typing import Any, Dict, List, Optional, Tuple
 
 from pydantic import BaseModel
 
-from dhisana.utils.generate_structured_output_internal import get_structured_output_with_o1
+from dhisana.utils.generate_structured_output_internal import get_structured_output_internal
 from dhisana.utils.workflow_code_model import WorkflowPythonCode
 
 # Example imports: adapt paths to your actual modules
@@ -69,8 +69,8 @@ async def generate_three_step_workflow(
     {english_description}
     """
 
-    # Use get_structured_output_with_o1 to parse LLM output into ThreeStepWorkflow
-    response_obj, status = await get_structured_output_with_o1(
+    # Use get_structured_output_internal to parse LLM output into ThreeStepWorkflow
+    response_obj, status = await get_structured_output_internal(
         user_prompt,
         ThreeStepWorkflow,
         tool_config=tool_config

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/src/dhisana/utils/compose_workflow.py

@@ -5,7 +5,7 @@ from typing import Any, Dict, List, Optional
 import openai
 from pydantic import BaseModel
 
-from dhisana.utils.generate_structured_output_internal import get_structured_output_with_o1
+from dhisana.utils.generate_structured_output_internal import get_structured_output_internal
 from dhisana.utils.agent_task import execute_task
 from dhisana.utils.compose_salesnav_query import generate_salesnav_people_search_url
 from dhisana.utils.check_for_intent_signal import check_for_intent_signal
@@ -191,7 +191,7 @@ async def custom_workflow(tool_config):
     Output is in valid JSON format.
     """
 
-    response, status = await get_structured_output_with_o1(
+    response, status = await get_structured_output_internal(
         user_prompt, WorkflowPythonCode, tool_config=tool_config
     )
     return response.model_dump(), status

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/src/dhisana/utils/create_list_from_sales_navigator.py

@@ -3,7 +3,7 @@ import logging
 from typing import Any, Dict, List, Optional, Tuple
 
 
-from dhisana.utils.generate_structured_output_internal import get_structured_output_with_o1, get_structured_output_with_o1
+from dhisana.utils.generate_structured_output_internal import get_structured_output_internal, get_structured_output_internal
 from dhisana.utils.workflow_code_model import WorkflowPythonCode
 
 # Initialize logger
@@ -193,7 +193,7 @@ async def generate_sales_nav_list_workflow_code(
     """
 
     # Call the LLM
-    response, status = await get_structured_output_with_o1(
+    response, status = await get_structured_output_internal(
         user_prompt, WorkflowPythonCode, tool_config=tool_config
     )
     return response.model_dump(), status

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/src/dhisana/utils/create_smart_list.py

@@ -2,7 +2,7 @@ import json
 import logging
 from typing import Any, Dict, List, Optional, Tuple
 
-from dhisana.utils.generate_structured_output_internal import get_structured_output_with_o1
+from dhisana.utils.generate_structured_output_internal import get_structured_output_internal
 from dhisana.utils.workflow_code_model import WorkflowPythonCode
 
 # Initialize logger
@@ -149,7 +149,7 @@ async def generate_smart_list_creation_code(
     }}
     """
 
-    response, status = await get_structured_output_with_o1(
+    response, status = await get_structured_output_internal(
         user_prompt, WorkflowPythonCode, tool_config=tool_config
     )
     return response.model_dump(), status

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/src/dhisana/utils/dataframe_tools.py

@@ -33,13 +33,13 @@ class PandasQuery(BaseModel):
     
 
 @assistant_tool   
-async def get_structured_output(message: str, response_type, model: str = "gpt-4o"):
+async def get_structured_output(message: str, response_type, model: str = "o3-mini"):
     """
     Asynchronously retrieves structured output from the OpenAI API based on the input message.
 
     :param message: The input message to be processed by the OpenAI API.
     :param response_type: The expected format of the response (e.g., JSON).
-    :param model: The model to be used for processing the input message. Defaults to "gpt-4o".
+    :param model: The model to be used for processing the input message. Defaults to "o3-mini".
     :return: A tuple containing the parsed response and a status string ('SUCCESS' or 'FAIL').
     """
     try:

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/src/dhisana/utils/generate_email.py

@@ -5,7 +5,7 @@ import aiohttp
 from pydantic import BaseModel
 from dhisana.schemas.sales import ContentGenerationContext, Lead, PromptEngineeringGuidance
 from dhisana.utils.assistant_tool_tag import assistant_tool
-from dhisana.utils.generate_structured_output_internal import get_structured_output_with_o1, get_structured_output_with_assistant_and_vector_store    
+from dhisana.utils.generate_structured_output_internal import get_structured_output_internal, get_structured_output_with_assistant_and_vector_store    
 
 # Define a model for email copy information
 class EmailCopy(BaseModel):
@@ -103,7 +103,7 @@ async def generate_personalized_email_copy(
                                                                                    vector_store_id=email_context.external_openai_vector_store_id, 
                                                                                    tool_config=tool_config)
     else:
-        response, status = await get_structured_output_with_o1(prompt, EmailCopy, tool_config=tool_config)
+        response, status = await get_structured_output_internal(prompt, EmailCopy, tool_config=tool_config)
 
     if status != 'SUCCESS':
         raise Exception("Error in generating the personalized email.")

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/src/dhisana/utils/generate_email_response.py

@@ -6,7 +6,7 @@ from dhisana.schemas.sales import ContentGenerationContext
 from dhisana.utils.assistant_tool_tag import assistant_tool
 from dhisana.utils.generate_structured_output_internal import (
     get_structured_output_with_assistant_and_vector_store,
-    get_structured_output_with_o1
+    get_structured_output_internal
 )
 
 # ---------------------------------------------------------------------------------------
@@ -114,7 +114,7 @@ async def generate_inbound_email_response_copy(
             tool_config=tool_config
         )
     else:
-        response, status = await get_structured_output_with_o1(
+        response, status = await get_structured_output_internal(
             prompt=prompt,
             response_format=InboundEmailTriageResponse,
             tool_config=tool_config

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/src/dhisana/utils/generate_linkedin_connect_message.py

@@ -3,7 +3,7 @@ from typing import Dict, List, Optional
 from pydantic import BaseModel
 from dhisana.schemas.sales import ContentGenerationContext
 from dhisana.utils.generate_structured_output_internal import (
-    get_structured_output_with_o1,
+    get_structured_output_internal,
     get_structured_output_with_assistant_and_vector_store
 )
 from dhisana.utils.assistant_tool_tag import assistant_tool
@@ -93,7 +93,7 @@ async def generate_personalized_linkedin_message_copy(
             tool_config=tool_config
         )
     else:
-        response, status = await get_structured_output_with_o1(
+        response, status = await get_structured_output_internal(
             prompt,
             LinkedInConnectMessage,
             tool_config=tool_config

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/src/dhisana/utils/generate_linkedin_response_message.py

@@ -2,7 +2,7 @@ from typing import Any, Dict, List, Optional
 from pydantic import BaseModel
 from dhisana.schemas.sales import ContentGenerationContext
 from dhisana.utils.generate_structured_output_internal import (
-    get_structured_output_with_o1,
+    get_structured_output_internal,
     get_structured_output_with_assistant_and_vector_store
 )
 from dhisana.utils.assistant_tool_tag import assistant_tool
@@ -130,9 +130,9 @@ async def generate_linkedin_response_message_copy(
             tool_config=tool_config
         )
     else:
-        response, status = await get_structured_output_with_o1(
-            prompt=prompt,
-            response_format=LinkedInTriageResponse,
+        response, status = await get_structured_output_internal(
+            prompt,
+            LinkedInTriageResponse,
             tool_config=tool_config
         )
 

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/src/dhisana/utils/generate_structured_output_internal.py

@@ -36,7 +36,7 @@ async def get_structured_output_internal(message: str, response_type, tool_confi
         OPENAI_KEY = get_openai_access_token(tool_config)
         client = AsyncOpenAI(api_key=OPENAI_KEY)
         completion = await client.beta.chat.completions.parse(
-            model="gpt-4o-2024-08-06",
+            model="o3-mini",
             messages=[
                 {"role": "system", "content": "Extract structured content from input. Output is in JSON Format."},
                 {"role": "user", "content": message},
@@ -136,79 +136,4 @@ async def get_structured_output_with_assistant_and_vector_store(prompt: str, res
         raise HTTPException(status_code=500, detail="An unexpected error occurred while processing your request.")
     finally:
         if assistant:
-            await delete_assistant(assistant.id, tool_config)
-
-    
-async def get_structured_output_with_o1(
-    prompt: str,
-    response_format,
-    tool_config: Optional[List[Dict]] = None
-) -> Tuple[Any, str]:
-    """
-    Gets structured output from the o1 model given a message, a response type, 
-    and optional tool configuration.
-    """
-    try:
-        # Use the class name instead of serializing the class
-        response_type_str = response_format.__name__
-        message_hash = hashlib.md5(prompt.encode('utf-8')).hexdigest()
-        response_type_hash = hashlib.md5(response_type_str.encode('utf-8')).hexdigest()
-        cache_key = f"{message_hash}:{response_type_hash}"
-        cached_response = cache_output_tools.retrieve_output(
-            "get_structured_output_with_o1", cache_key
-        )
-        if cached_response is not None:
-            parsed_cached_response = response_format.parse_raw(cached_response)
-            return parsed_cached_response, 'SUCCESS'
-
-        OPENAI_KEY = get_openai_access_token(tool_config)
-        client = AsyncOpenAI(api_key=OPENAI_KEY)
-        o1_response = await client.chat.completions.create(
-            model="o1-mini",
-            messages=[
-                {"role": "user", "content": prompt}
-            ]
-        )
-
-        o1_response_content = o1_response.choices[0].message.content
-        response = await client.beta.chat.completions.parse(
-            model="gpt-4o-mini",
-            messages=[
-                {
-                    "role": "user",
-                    "content": f"Given the following data, format it with the given response format: {o1_response_content}"
-                }
-            ],
-            response_format=response_format,
-        )
-
-        response = response.choices[0].message
-        if response.parsed:
-            cache_output_tools.cache_output(
-                "get_structured_output_with_o1",
-                cache_key,
-                response.parsed.json()
-            )
-            return response.parsed, 'SUCCESS'
-        elif response.refusal:
-            logging.warning("ERROR: Refusal response: %s", response.refusal)
-            return response.refusal, 'FAIL'
-
-    except LengthFinishReasonError as e:
-        logging.error(f"Too many tokens: {e}")
-        raise HTTPException(
-            status_code=502,
-            detail="The request exceeded the maximum token limit."
-        )
-    except OpenAIError as e:
-        logging.error(f"OpenAI API error: {e}")
-        raise HTTPException(
-            status_code=502,
-            detail="Error communicating with the OpenAI API."
-        )
-    except Exception as e:
-        logging.error(f"Unexpected error: {e}")
-        raise HTTPException(
-            status_code=500,
-            detail="An unexpected error occurred while processing your request."
-        )
+            await delete_assistant(assistant.id, tool_config)

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/src/dhisana/utils/openai_assistant_and_file_utils.py

@@ -519,7 +519,7 @@ async def run_function_callback(
     client = AsyncOpenAI(api_key=openai_key)
     try:
         chat_response = await client.chat.completions.create(
-            model="gpt-4o-2024-08-06",
+            model="o3-mini",
             messages=messages,
             tools=tools,
             response_format={"type": "json_object"},
@@ -548,7 +548,7 @@ async def run_function_callback_multiple(
     client = AsyncOpenAI(api_key=openai_key)
     try:
         chat_response = await client.chat.completions.create(
-            model="gpt-4o-2024-08-06",
+            model="o3-mini",
             messages=messages,
             tools=tools,
             response_format={"type": "json_object"},
@@ -595,7 +595,7 @@ async def run_chat_completion_text(
     openai_key = get_openai_access_token(tool_config)
     client = AsyncOpenAI(api_key=openai_key)
     chat_response = await client.chat.completions.create(
-        model="gpt-4o-2024-08-06",
+        model="o3-mini",
         messages=messages,
         temperature=0.0,
         max_tokens=max_tokens,
@@ -624,7 +624,7 @@ async def run_chat_completion(
     openai_key = get_openai_access_token(tool_config)
     client = AsyncOpenAI(api_key=openai_key)
     chat_response = await client.chat.completions.create(
-        model="gpt-4o-2024-08-06",
+        model="o3-mini",
         messages=messages,
         tools=tools,
         response_format={"type": "json_object"},
@@ -676,7 +676,7 @@ async def run_chat_completion_json(
     openai_key = get_openai_access_token(tool_config)
     client = AsyncOpenAI(api_key=openai_key)
     chat_response = await client.chat.completions.create(
-        model="gpt-4o-2024-08-06",
+        model="o3-mini",
         messages=messages,
         response_format={"type": "json_object"},
         temperature=0.0,
@@ -721,7 +721,7 @@ async def run_chat_completion_structured_output(
     openai_key = get_openai_access_token(tool_config)
     client = AsyncOpenAI(api_key=openai_key)
     chat_response = await client.beta.chat.completions.parse(
-        model="gpt-4o-2024-08-06",
+        model="o3-mini",
         messages=messages,
         response_format=response_format,
         temperature=0.0,

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/src/dhisana/utils/openai_helpers.py

@@ -328,7 +328,7 @@ async def process_agent_request(row_batch: List[Dict], workflow: Dict, custom_in
             name="AI Assistant",
             instructions=instructions,   
             tools=[],
-            model="gpt-4o-2024-08-06"
+            model="o3-mini"
         )
         thread = await client.beta.threads.create()
         parsed_outputs = []
@@ -952,7 +952,7 @@ async def get_function_call_arguments(input_text: str, function_name: str) -> Tu
         
         # Make the API call
         response = await client.beta.chat.completions.parse(
-            model="gpt-4o-2024-08-06",
+            model="o3-mini",
             messages=[
                 {"role": "system", "content": "Extract function arguments in JSON format."},
                 {"role": "user", "content": prompt},

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/src/dhisana/utils/research_lead.py

@@ -5,7 +5,7 @@
 from typing import Dict, List, Optional
 from pydantic import BaseModel
 from dhisana.utils.assistant_tool_tag import assistant_tool
-from dhisana.utils.generate_structured_output_internal import get_structured_output_with_o1    
+from dhisana.utils.generate_structured_output_internal import get_structured_output_internal    
 
 # Define a model for lead research information
 class LeadResearchInformation(BaseModel):
@@ -54,7 +54,7 @@ async def research_lead_with_icp_ai(user_properties: dict, icp: str, instruction
         "icp_match_score": "Score of how well the lead matches the ICP (0-5). 0 no match, 5 perfect match."
     }}
     """
-    response, status = await get_structured_output_with_o1(instructions, LeadResearchInformation, tool_config=tool_config)
+    response, status = await get_structured_output_internal(instructions, LeadResearchInformation, tool_config=tool_config)
     return response.model_dump()
 
 
@@ -114,5 +114,5 @@ async def research_lead_with_full_info_ai(user_properties: dict, instructions:st
         }}
 
     """
-    response, status = await get_structured_output_with_o1(instructions, LeadResearchInformation, tool_config=tool_config)
+    response, status = await get_structured_output_internal(instructions, LeadResearchInformation, tool_config=tool_config)
     return response.model_dump()

{dhisana-0.0.1.dev30 → dhisana-0.0.1.dev32}/src/dhisana.egg-info/PKG-INFO

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