dhisana 0.0.1.dev116__py3-none-any.whl → 0.0.1.dev236__py3-none-any.whl

dhisana/schemas/common.py

@@ -364,6 +364,12 @@ class Integration(IntegrationBase):
 Integration.model_rebuild()
 IntegrationUpdate.model_rebuild()
 
+class BodyFormat(str, Enum):
+    AUTO = "auto"
+    HTML = "html"
+    TEXT = "text"
+
+
 class SendEmailContext(BaseModel):
     recipient: str
     subject: str
@@ -371,6 +377,7 @@ class SendEmailContext(BaseModel):
     sender_name: str
     sender_email: str
     labels: Optional[List[str]]
+    body_format: BodyFormat = BodyFormat.AUTO
     
 class QueryEmailContext(BaseModel):
     start_time: str
@@ -385,5 +392,7 @@ class ReplyEmailContext(BaseModel):
     reply_body: str
     sender_email: str
     sender_name: str
+    fallback_recipient: Optional[str] = None
     mark_as_read: str = "True"
-    add_labels: Optional[List[str]] = None
+    add_labels: Optional[List[str]] = None
+    reply_body_format: BodyFormat = BodyFormat.AUTO

dhisana/schemas/sales.py

@@ -1,24 +1,31 @@
+import json
+
 from uuid import UUID
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 from typing import List, Optional, Dict, Any
 from enum import Enum
 from typing import Optional, List, Dict, Literal
 
-from dhisana.schemas.common import User
 
 # -----------------------------
 # Lead-List-Specific Schemas
 # -----------------------------
 
 class Lead(BaseModel):
-    id: Optional[str] = None
+    id: Optional[UUID] = None
     full_name: Optional[str] = None
     first_name: Optional[str] = None
     last_name: Optional[str] = None
     email: Optional[str] = None
     user_linkedin_url: Optional[str] = None
     user_linkedin_salesnav_url: Optional[str] = None
+    organization_linkedin_url: Optional[str] = None
+    organization_linkedin_salesnav_url: Optional[str] = None
+    linkedin_follower_count: Optional[int] = None
     primary_domain_of_organization: Optional[str] = None
+    twitter_handle: Optional[str] = None
+    twitch_handle: Optional[str] = None
+    github_handle: Optional[str] = None
     job_title: Optional[str] = None
     phone: Optional[str] = None
     headline: Optional[str] = None
@@ -26,25 +33,69 @@ class Lead(BaseModel):
     organization_name: Optional[str] = None
     organization_website: Optional[str] = None
     summary_about_lead: Optional[str] = None
+
+    qualification_score: Optional[float] = None
+    qualification_reason: Optional[str] = None
+    revenue: Optional[str] = None
+    company_size: Optional[str] = None
+    industry: Optional[str] = None
+
+    keywords: Optional[Any] = None
+    tags: List[str] = []
+    notes: List[str] = []
+    additional_properties: Optional[Dict[str, Any]] = {}
     workflow_stage: Optional[str] = None
-    assigned_to: Optional[str] = None
-    engaged: Optional[bool] = None
+
+    engaged: bool = False
     last_contact: Optional[int] = None
-    additional_properties: Optional[Dict[str, str]] = None
     research_summary: Optional[str] = None
     task_ids: Optional[List[str]] = None
-    email_validation_status: Optional[
-        Literal["not_started", "in_progress", "valid", "invalid"]
-    ] = None
-    linkedin_validation_status: Optional[
-        Literal["not_started", "in_progress", "valid", "invalid"]
-    ] = None
-    research_status: Optional[
-        Literal["not_started", "in_progress", "done", "failed"]
-    ] = None
-    enchrichment_status: Optional[
-        Literal["not_started", "in_progress", "done", "failed"]
-    ] = None
+    email_validation_status: Optional[str] = None
+    linkedin_validation_status: Optional[str] = None
+    research_status: Optional[str] = None
+    enchrichment_status: Optional[str] = None
+
+
+    @field_validator("linkedin_follower_count", mode="before")
+    @classmethod
+    def parse_linkedin_follower_count(cls, v):
+        if v is None or v == "":
+            return None
+        if isinstance(v, str):
+            v = v.strip()
+            if v == "":
+                return None
+            try:
+                return int(v)
+            except ValueError:
+                raise ValueError("linkedin_follower_count must be an integer")
+        return v
+
+    @field_validator("notes", mode="before")
+    @classmethod
+    def ensure_notes_list(cls, v):
+        """Coerce notes to a list of strings.
+        Handles legacy cases where the DB may contain a scalar or JSON string.
+        """
+        if v is None:
+            return []
+        if isinstance(v, list):
+            # Ensure all elements are strings
+            return [str(item) if not isinstance(item, str) else item for item in v]
+        if isinstance(v, str):
+            # Try to parse JSON array; if not, wrap as single-note list
+            try:
+                parsed = json.loads(v)
+                if isinstance(parsed, list):
+                    return [str(item) if not isinstance(item, str) else item for item in parsed]
+            except Exception:
+                pass
+            return [v]
+        # Fallback: wrap any other scalar/object as a single string entry
+        try:
+            return [json.dumps(v)]
+        except Exception:
+            return [str(v)]
 
 
 class LeadList(BaseModel):
@@ -240,9 +291,14 @@ class MessageGenerationInstructions(BaseModel):
     Holds the user-supplied instructions for generating the message:
       - instructions_to_generate_message: Plain text or template instructions from the user.
       - prompt_engineering_guidance: (Optional) Extra guidelines for structuring the prompt.
+      - allow_html: Whether HTML output is allowed.
+      - html_template: Optional HTML scaffolding or guidance.
     """
     instructions_to_generate_message: Optional[str] = None
     prompt_engineering_guidance: Optional[PromptEngineeringGuidance] = None
+    use_cache: Optional[bool] = True
+    allow_html: Optional[bool] = False
+    html_template: Optional[str] = None
 
 class CampaignContext(BaseModel):
     """
@@ -304,6 +360,7 @@ class MessageItem(BaseModel):
         ...,
         description="Body of the message in plain text"
     )
+    html_body: Optional[str] = None
 
 class MessageResponse(BaseModel):
     """
@@ -439,14 +496,14 @@ class HubSpotLeadInformation(BaseModel):
     organization_name: str = Field("", description="Current Company where lead works")
     organization_website: str = Field("", description="Current Company website of the lead")
     organization_linkedin_url : str = Field("", description="Company LinkedIn URL")
-    additional_properties: Optional[Dict[str, str]] = None
+    additional_properties: Optional[Dict[str, Any]] = None
 
 class HubSpotCompanyinformation(BaseModel):
     primary_domain_of_organization: str = Field("", description="Primary domain of the organization")
     organization_name: str = Field("", description="Current Company where lead works")
     organization_website: str = Field("", description="Current Company website of the lead")
     organization_linkedin_url : str = Field("", description="Company LinkedIn URL")
-    additional_properties: Optional[Dict[str, str]] = None
+    additional_properties: Optional[Dict[str, Any]] = None
 
 
 # --------------------------------------------------------------------
@@ -463,6 +520,7 @@ HUBSPOT_TO_LEAD_MAPPING = {
     "address": "lead_location",         # You can choose "city", "state", etc. if you prefer
     "city": "lead_location",
     "domain": "primary_domain_of_organization",
+    "hs_linkedin_url": "user_linkedin_url",
 }
 
 class SmartListStatus(str, Enum):
@@ -483,6 +541,11 @@ class SmartListSourceType(str, Enum):
     GOOGLE_SHEETS = "GOOGLE_SHEETS"
     CUSTOM_WEBSITE = "CUSTOM_WEBSITE"
     GITHUB = "GITHUB"
+    ICP_SEARCH = "ICP_SEARCH"
+    LOCAL_BUSINESS = "LOCAL_BUSINESS"
+    GOOGLE_JOBS = "GOOGLE_JOBS"
+    WEBHOOK = "WEBHOOK"
+    GOOGLE_CUSTOM_SITE_SEARCH = "GOOGLE_CUSTOM_SITE_SEARCH"
 
 class SourceConfiguration(BaseModel):
     """
@@ -578,13 +641,18 @@ class SmartListLead(BaseModel):
     organization_name: Optional[str] = None
     organization_website: Optional[str] = None
     summary_about_lead: Optional[str] = None
-    keywords: Optional[List[str]] = None
+    keywords: Optional[Any] = None
     additional_properties: Optional[Dict[str, Any]] = None
     research_summary: Optional[str] = None
 
     qualification_score: Optional[float] = None
     qualification_reason: Optional[str] = None
     source: Optional[str] = None
+    
+    email_validation_status: Optional[str] = None
+    linkedin_validation_status: Optional[str] = None
+    research_status: Optional[str] = None
+    enchrichment_status: Optional[str] = None
 
     agent_instance_id: Optional[UUID] = None
     organization_id: Optional[UUID] = None
@@ -596,7 +664,6 @@ class SmartListLead(BaseModel):
     revenue: Optional[str] = None
     company_size: Optional[str] = None
     industry: Optional[str] = None
-
     class Config:
         from_attributes = True
 
@@ -761,3 +828,117 @@ class LeadsQueryFilters(BaseModel):
         description="Ranges for organization number of employees."
     )
 
+
+class CompanyQueryFilters(BaseModel):
+    """
+    Defines the filter parameters for querying companies/organizations in the Apollo database.
+    All fields are optional and default to None if not specified by user.
+    """
+
+    # Core company search parameters
+    organization_locations: Optional[List[str]] = Field(
+        default=None,
+        description="List of organization headquarters locations (city, state, country)."
+    )
+
+    organization_num_employees_ranges: Optional[List[str]] = Field(
+        default=None,
+        description="Employee count ranges, e.g. ['1,10', '11,50', '51,200']. Use specific ranges."
+    )
+
+    min_employees: Optional[int] = Field(
+        default=None,
+        description="Minimum number of employees (>=1). Internally converted to a numeric range."
+    )
+    
+    max_employees: Optional[int] = Field(
+        default=None,
+        description="Maximum number of employees (<=100000). Internally converted to a numeric range."
+    )
+
+    organization_industries: Optional[List[str]] = Field(
+        default=None,
+        description="List of organization industries."
+    )
+
+    organization_industry_tag_ids: Optional[List[str]] = Field(
+        default=None,
+        description="List of industry tag IDs, e.g. ['5567cd4773696439b10b0000']."
+    )
+
+    # Revenue filters
+    revenue_range_min: Optional[int] = Field(
+        default=None,
+        description="Minimum company revenue in USD."
+    )
+    
+    revenue_range_max: Optional[int] = Field(
+        default=None,
+        description="Maximum company revenue in USD."
+    )
+
+    # Funding and growth
+    organization_latest_funding_stage_cd: Optional[List[str]] = Field(
+        default=None,
+        description="List of funding stage codes, e.g. ['2', '3', '10']."
+    )
+
+    # Technology and keywords
+    currently_using_any_of_technology_uids: Optional[List[str]] = Field(
+        default=None,
+        description="Technology UIDs used by the organization, e.g. ['google_font_api']."
+    )
+
+    q_keywords: Optional[str] = Field(
+        default=None,
+        description="Keywords to search for in company descriptions, names, etc."
+    )
+
+    q_organization_domains: Optional[List[str]] = Field(
+        default=None,
+        description="Specific company domains to search for, e.g. ['microsoft.com', 'google.com']."
+    )
+
+    # Company-specific filters
+    organization_ids: Optional[List[str]] = Field(
+        default=None,
+        description="Specific Apollo organization IDs to include."
+    )
+
+    not_organization_ids: Optional[List[str]] = Field(
+        default=None,
+        description="Apollo organization IDs to exclude from results."
+    )
+
+    # Search lists
+    q_organization_search_list_id: Optional[str] = Field(
+        default=None,
+        description="Include only organizations in a specific search list."
+    )
+    
+    q_not_organization_search_list_id: Optional[str] = Field(
+        default=None,
+        description="Exclude organizations in a specific search list."
+    )
+
+    # Sorting
+    sort_by_field: Optional[str] = Field(
+        default=None,
+        description="Sort field, e.g. 'name', 'employee_count', 'last_updated', etc."
+    )
+    
+    sort_ascending: Optional[bool] = Field(
+        default=None,
+        description="Sort ascending (True) or descending (False)."
+    )
+
+    # Additional filters that might be useful
+    organization_founded_year_min: Optional[int] = Field(
+        default=None,
+        description="Minimum founding year for the organization."
+    )
+    
+    organization_founded_year_max: Optional[int] = Field(
+        default=None,
+        description="Maximum founding year for the organization."
+    )

dhisana/utils/add_mapping.py

@@ -1,9 +1,7 @@
 import hashlib
-from urllib.parse import urlparse
 from typing import List, Optional
 import logging
 from typing import Optional, Dict, Any
-from pydantic import ValidationError
 from dhisana.schemas.sales import MessageItem
 from dhisana.utils.cache_output_tools import (
     retrieve_output,