dhisana 0.0.1.dev18__tar.gz → 0.0.1.dev20__tar.gz

{dhisana-0.0.1.dev18 → dhisana-0.0.1.dev20}/PKG-INFO

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

{dhisana-0.0.1.dev18 → dhisana-0.0.1.dev20}/setup.py

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

{dhisana-0.0.1.dev18 → dhisana-0.0.1.dev20}/src/dhisana/schemas/common.py

@@ -9,6 +9,7 @@ from enum import Enum
 
 class PermissionBase(BaseModel):
     name: str
+    label: Optional[str] = None
     description: Optional[str] = None
 
 class PermissionCreate(PermissionBase):
@@ -22,6 +23,7 @@ class Permission(PermissionBase):
 
 class RoleBase(BaseModel):
     name: str
+    label: Optional[str] = None
     description: Optional[str] = None
 
 class RoleCreate(RoleBase):
@@ -59,23 +61,18 @@ class Organization(OrganizationBase):
 # USER
 ##
 
-class UserBase(BaseModel):
-    id: str
-    username: Optional[str]
-    email: Optional[str]
-    organization_id: Optional[UUID]
+class User(BaseModel):
+    id: Optional[UUID] = None
+    auth0_user_id: Optional[str] = None
+    username: Optional[str] = None
+    email: Optional[str] = None
+    organization_id: Optional[UUID] = None
     created_at: Optional[int] = None
-
-class UserCreate(UserBase):
-    pass
-
-class User(UserBase):
-    roles: List[Role] = []
+    roles: Optional[List[Role]] = []
 
     class Config:
         from_attributes = True
 
-
 ##
 # AGENT + STATUSES
 ##
@@ -225,12 +222,9 @@ class Agent(BaseModel):
     status: Optional[AgentStatus] = AgentStatus.PENDING
 
     organization_id: Optional[UUID] = None
-    created_by: Optional[str] = None
-
-    # changed from datetime -> milliseconds since epoch
+    created_by: Optional[UUID] = None
     created_at: Optional[int] = None
-
-    updated_by: Optional[str] = None
+    updated_by: Optional[UUID] = None
     updated_at: Optional[int] = None
 
     class Config:
@@ -259,10 +253,9 @@ class AgentInstance(BaseModel):
     port: Optional[int] = None
 
     organization_id: Optional[UUID] = None
-    created_by: Optional[str] = None
-    # changed from datetime -> milliseconds
+    created_by: Optional[UUID] = None    
     created_at: Optional[int] = None
-    updated_by: Optional[str] = None
+    updated_by: Optional[UUID] = None
     updated_at: Optional[int] = None
 
     class Config:
@@ -281,8 +274,9 @@ class AgentInstanceData(BaseModel):
     agent_instance_id: UUID
     organization_id: UUID
     data: Dict[str, Any]
-    # changed from datetime -> milliseconds
+    created_by: Optional[UUID] = None    
     created_at: Optional[int] = None
+    updated_by: Optional[UUID] = None
     updated_at: Optional[int] = None
 
     class Config:
@@ -318,6 +312,7 @@ class Source(SourceBase):
     agent_instance_id: UUID
     # changed from datetime -> milliseconds
     created_at: Optional[int] = None
+    created_by: Optional[UUID] = None
 
     class Config:
         populate_by_name = True
@@ -358,9 +353,9 @@ class IntegrationUpdate(BaseModel):
 class Integration(IntegrationBase):
     id: UUID
     agent_instance_id: UUID
-    organization_id: UUID
-    # changed from datetime -> milliseconds
+    organization_id: UUID    
     created_at: Optional[int] = None
+    created_by: Optional[UUID] = None
 
     class Config:
         from_attributes = True

{dhisana-0.0.1.dev18 → dhisana-0.0.1.dev20}/src/dhisana/schemas/sales.py

@@ -25,7 +25,6 @@ class Lead(BaseModel):
     organization_name: Optional[str] = None
     organization_website: Optional[str] = None
     summary_about_lead: Optional[str] = None
-    keywords: Optional[List[str]] = None
     workflow_stage: Optional[str] = None
     assigned_to: Optional[str] = None
     engaged: Optional[bool] = None
@@ -244,6 +243,7 @@ class HubSpotLeadInformation(BaseModel):
     lead_location: str = Field("", description="Location of the lead")
     organization_name: str = Field("", description="Current Company where lead works")
     organization_website: str = Field("", description="Current Company website of the lead")
+    company_linkedin_url: str = Field("", description="Company LinkedIn URL")
     # additional_properties is dict of dict-of-strings. 
     # We store all unmapped HubSpot fields as string => string.
     additional_properties: Dict[str, Dict[str, str]] = Field(
@@ -265,12 +265,4 @@ HUBSPOT_TO_LEAD_MAPPING = {
     "address": "lead_location",         # You can choose "city", "state", etc. if you prefer
     "city": "lead_location",
     "domain": "primary_domain_of_organization",
-}
-
-# Potential LinkedIn fallback properties from hubspot.
-LINKEDIN_FALLBACK_FIELDS = [
-    "person_profile_url",
-    "user_linkedin_url",
-    "lead_linkedin_url",
-    "contact_linkedin_url",
-]
+}

{dhisana-0.0.1.dev18 → dhisana-0.0.1.dev20}/src/dhisana/utils/generate_email.py

@@ -83,31 +83,51 @@ async def generate_personalized_email_copy(
     You’re an expert at crafting professional, concise, and compelling sales outreach emails.
     Use the details below to self-contain your reasoning, ensuring personalization, a clear value proposition,
     and adherence to the specified email template. Avoid spam triggers or irrelevant info.
+
+    **Important**: 
+    1. Do your reasoning internally. 
+    2. Do NOT include the chain-of-thought in the output. 
+    3. The final answer must be a JSON object containing only the fields 'subject' and 'body'.
+    4. This is final copy of the email to be sent to the lead directly. DO NOT include any placeholders, comments or instructions in the final output.
+
     Make sure to use the file_search with attached files to generate the personalized email.
     The attached files have relevant information on case studies, product details, and customer testimonials.
-    
-    Lead & Campaign Details:
+
+    Steps:
+    1. Summarize the user’s role and experience.
+    2. Summarize the company and what it does.
+    3. Highlight how our product offering/campaign aligns with the user’s needs and company goals.
+    4. Craft a personalized email with a compelling reason to reach out and a clear CTA.
+
+    Pro Tips for B2B Enterprise Emails:
+    - Personalization: Reference the prospect’s role, recent activities, relevant vertical solutions, or any mutual connections.
+    - Brevity: Keep it concise.
+    - Social Proof: Mention relevant success stories if applicable.
+    - Clear CTA: End with a single call to action.
+
+    Lead Information & Campaign Details provided by user below:
     {email_context.model_dump()}
-    
-    Following property has information about the sender of the email (Can be used in Signature):
-    sender_first_name: str
-    sender_last_name: str
-    
-    Following property has information about the lead whom the email is being sent to:
-    lead_info: Lead
 
+    Sender Info (Signature Use):
+    - sender_first_name: str
+    - sender_last_name: str
+
+    Lead Info:
+    - lead_info: Lead
 
     Output Format (JSON):
     {{
         "subject": "Personalized subject line.",
         "body": "Personalized email body content."
     }}
-    Use following info for this variation:
+
+    Use the following info for this variation:
     {variation}
-    
+
     After writing, review the content for relevance, clarity, and professionalism.
-    Use personalization only when relevant for the campaign and product; don’t add irrelevant details
-    such as city or school information.
+    Use personalization ONLY when relevant for the campaign and product; don’t add irrelevant details
+    such as city or school information. DO NOT USE any user identifiers, PII, tracking IDs, internal
+    information like deal size, or any other sensitive information in email body generated.
     """
 
     response, status = await get_structured_output_with_assistant_and_vector_store(prompt=prompt, 
@@ -139,9 +159,14 @@ async def generate_personalized_email(
         Exception: If there is an error in processing the request.
     """
     variation_specs = [
-        "Explain how the product addresses the company’s current goals and requirements.",
-        "Provide proof points or success stories demonstrating how the solution supports similar businesses in the same industry.",
-        "Showcase how this product outperforms competing solutions and benefits companies like the lead’s."
+        "Use VETO framework (Value, Evidence, Tie, Offer) to compose email.Explain how the product addresses the company’s current goals and requirements.",
+        "Use AIDA framework (Attention, Interest, Desire, Action) to compose email.",
+        "Use PAS (Problem, Agitate, Solve) framework to write up email.",
+        "Use SPIN (Situation, Problem, Implication, Need-Payoff) framework to write up email.",
+        "Use BANT (Budget, Authority, Need, Timeline) framework to write up email.",
+        "Use P-S-B (Pain, Solution, Benefit) framework to write up email."
+        "Use The 3-Bullet Approach (1. Industry Trend or Pain, 2. Value Statement 3. Simple Ask) framework to write up email. Keep it under 100 words."
+        "Use Hook, Insight, Offer framework to write up email."
     ]
     email_variations = []
     for i in range(number_of_variations):

{dhisana-0.0.1.dev18 → dhisana-0.0.1.dev20}/src/dhisana/utils/hubspot_crm_tools.py

@@ -1,10 +1,11 @@
 # Hubspot CRM Tools
 import os
 import aiohttp
-from dhisana.schemas.sales import HUBSPOT_TO_LEAD_MAPPING, LINKEDIN_FALLBACK_FIELDS, HubSpotLeadInformation
+from dhisana.schemas.sales import HUBSPOT_TO_LEAD_MAPPING, HubSpotLeadInformation
 from dhisana.utils.assistant_tool_tag import assistant_tool
 from typing import Optional, List, Dict, Any
 from pydantic import BaseModel, Field
+from urllib.parse import urlparse
 
 
 # Tools to access hubspot CRM. Manage contacts, companies, deals, tickets, lists, etc.
@@ -571,27 +572,31 @@ async def fetch_last_n_activities(email: str, num_events: int, tool_config: Opti
             activities_data = await response.json()
 
         return activities_data
-    
-
-
-
 
 # --------------------------------------------------------------------
-# 3. Helper to transform HubSpot props -> LeadInformation, 
+# 3. Helper to transform HubSpot props -> HubSpotLeadInformation, 
 #    storing unmapped fields in "additional_properties" (as strings)
 # --------------------------------------------------------------------
+
+
+def is_valid_url(url: str) -> bool:
+    """Quickly check if the given string is a well-formed http/https URL."""
+    parsed = urlparse(url)
+    return parsed.scheme in ("http", "https") and bool(parsed.netloc)
+
 def transform_hubspot_contact_to_lead_info(
     hubspot_contact_properties: Dict[str, Any]
 ) -> HubSpotLeadInformation:
     """
     Convert a raw HubSpot property dict into a LeadInformation object.
     - Maps known properties (e.g., "company" -> organization_name).
-    - Handles user_linkedin_url fallback from fallback fields.
+    - If any field value contains "linkedin.com/in/", sets user_linkedin_url.
+    - If any field value contains "linkedin.com/company/", sets company_linkedin_url.
     - Builds 'full_name' if missing.
     - Stores unmapped fields under result["additional_properties"]["hubspot_lead_information"] as strings.
     """
 
-    # Prepare the result dict we'll use for the LeadInformation constructor.
+    # Prepare the result dict we'll use for the HubSpotLeadInformation constructor.
     result = {
         "full_name": "",
         "first_name": "",
@@ -605,39 +610,26 @@ def transform_hubspot_contact_to_lead_info(
         "lead_location": "",
         "organization_name": "",
         "organization_website": "",
+        "company_linkedin_url": "",
         "additional_properties": {"hubspot_lead_information": {}},
     }
 
-    # For convenience, create a set of properties we consider "handled" or "standard".
-    mapped_keys = set(HUBSPOT_TO_LEAD_MAPPING.keys())
-    # Add the fallback fields to skip them in additional_properties
-    fallback_keys = set(LINKEDIN_FALLBACK_FIELDS)
-    # "user_linkedin_url" is also a standard field to check
-    mapped_keys.add("user_linkedin_url")
-
-    # 1) Map standard HubSpot properties
+    # 1) Map standard HubSpot properties to our known fields
     for hubspot_prop, raw_value in hubspot_contact_properties.items():
-        # If property is in our known mapping, store it in the correct field
         if hubspot_prop in HUBSPOT_TO_LEAD_MAPPING:
             lead_field_name = HUBSPOT_TO_LEAD_MAPPING[hubspot_prop]
-            # Convert the value to a string if it's not None
             val_str = str(raw_value) if raw_value is not None else ""
             result[lead_field_name] = val_str
 
-    # 2) Handle user_linkedin_url fallback
-    #    If 'user_linkedin_url' not present or empty, check fallback fields.
-    hubspot_linkedin_url = hubspot_contact_properties.get("user_linkedin_url")
-    if not hubspot_linkedin_url:
-        found_linkedin_url = ""
-        for alt_field in LINKEDIN_FALLBACK_FIELDS:
-            alt_val = hubspot_contact_properties.get(alt_field)
-            if alt_val:
-                found_linkedin_url = str(alt_val)
-                break
-        result["user_linkedin_url"] = found_linkedin_url
-    else:
-        # If it's explicitly set, cast to string
-        result["user_linkedin_url"] = str(hubspot_linkedin_url) or ""
+    # 2) Look for any LinkedIn-related URLs in *any* property
+    for prop_key, prop_val in hubspot_contact_properties.items():
+        val_str = str(prop_val) if prop_val is not None else ""
+
+        if "linkedin.com/in/" in val_str and is_valid_url(val_str):
+            result["user_linkedin_url"] = val_str
+
+        if "linkedin.com/company/" in val_str and is_valid_url(val_str):
+            result["company_linkedin_url"] = val_str
 
     # 3) Build "full_name" if not explicitly given
     if not result["full_name"]:
@@ -646,9 +638,13 @@ def transform_hubspot_contact_to_lead_info(
         result["full_name"] = (fn + " " + ln).strip()
 
     # 4) Store any remaining/unmapped properties in additional_properties
+    #    (Skip the ones we already consider "standard")
+    standard_mapped_keys = set(HUBSPOT_TO_LEAD_MAPPING.keys()) | {
+        "user_linkedin_url",
+        "company_linkedin_url",
+    }
     for prop_key, prop_val in hubspot_contact_properties.items():
-        if prop_key not in mapped_keys and prop_key not in fallback_keys:
-            # Convert to string to avoid Pydantic errors
+        if prop_key not in standard_mapped_keys:
             val_str = str(prop_val) if prop_val is not None else ""
             result["additional_properties"]["hubspot_lead_information"][prop_key] = val_str
 
@@ -743,7 +739,7 @@ async def fetch_hubspot_list_records(
         # --------------------------------------------------------------------
         # Step 3: Batch read each contact to fetch all their properties
         # --------------------------------------------------------------------
-        contact_leads: List[LeadInformation] = []
+        contact_leads: List[HubSpotLeadInformation] = []
         batch_url = "https://api.hubapi.com/crm/v3/objects/contacts/batch/read"
         batch_size = 100  # Up to 100 IDs per request
 
@@ -1251,12 +1247,14 @@ async def fetch_hubspot_list_by_name(list_name: str, list_type: str = 'contacts'
                 raise Exception(f"Error: Received status code {response.status} with details: {error_details}")
 
 
+
 @assistant_tool
 async def list_all_crm_lists(payload=None, list_type="contacts", tool_config: Optional[List[Dict]] = None):
     """
     Fetches CRM lists from HubSpot with the option to filter by objectTypeId
     for contacts, companies, etc. Defaults to contacts.
     """
+
     object_type_map = {
         "contacts": "0-1",
         "companies": "0-2",
@@ -1281,18 +1279,27 @@ async def list_all_crm_lists(payload=None, list_type="contacts", tool_config: Op
         "Content-Type": "application/json"
     }
 
+    object_id = object_type_map.get(list_type, "0-1")
+    all_results = []
+
     async with aiohttp.ClientSession() as session:
-        async with session.post(url, headers=headers, json=payload) as response:
-            if response.status == 200:
-                data = await response.json()
-                all_lists = data.get("lists", [])
-                object_id = object_type_map.get(list_type, "0-1")
-                filtered_lists = [
-                    lst for lst in all_lists if lst.get("objectTypeId") == object_id
-                ]
-                return filtered_lists
-            else:
-                error_details = await response.text()
-                raise Exception(
-                    f"Error: Received status code {response.status} with details: {error_details}"
-                )
+        while True:
+            async with session.post(url, headers=headers, json=payload) as response:
+                if response.status == 200:
+                    data = await response.json()
+                    page_lists = data.get("lists", [])
+                    filtered_lists = [
+                        lst for lst in page_lists if lst.get("objectTypeId") == object_id
+                    ]
+                    all_results.extend(filtered_lists)
+
+                    if not data.get("hasMore"):
+                        break
+                    payload["offset"] = data.get("offset", 0)
+                else:
+                    error_details = await response.text()
+                    raise Exception(
+                        f"Error: Received status code {response.status} with details: {error_details}"
+                    )
+
+    return all_results

{dhisana-0.0.1.dev18 → dhisana-0.0.1.dev20}/src/dhisana/utils/openai_assistant_and_file_utils.py

@@ -6,7 +6,7 @@ from typing import AsyncIterable, Dict, List, Optional
 
 import openai
 from fastapi import HTTPException
-from openai import AsyncAssistantEventHandler, AsyncOpenAI, OpenAI
+from openai import AsyncAssistantEventHandler, AsyncOpenAI
 from openai.types.beta import Thread
 from typing_extensions import override
 from pydantic import BaseModel

{dhisana-0.0.1.dev18 → dhisana-0.0.1.dev20}/src/dhisana.egg-info/PKG-INFO

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