letschatty 0.4.349__py3-none-any.whl → 0.4.351__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of letschatty might be problematic. Click here for more details.
- letschatty/models/ai_microservices/__init__.py +4 -4
- letschatty/models/ai_microservices/expected_output.py +29 -2
- letschatty/models/ai_microservices/lambda_events.py +155 -28
- letschatty/models/ai_microservices/lambda_invokation_types.py +4 -1
- letschatty/models/ai_microservices/n8n_ai_agents_payload.py +3 -1
- letschatty/models/analytics/events/__init__.py +3 -3
- letschatty/models/analytics/events/chat_based_events/ai_agent_execution_event.py +71 -0
- letschatty/models/analytics/events/chat_based_events/chat_funnel.py +13 -69
- letschatty/models/analytics/events/company_based_events/asset_events.py +2 -9
- letschatty/models/analytics/events/event_type_to_classes.py +3 -7
- letschatty/models/analytics/events/event_types.py +50 -11
- letschatty/models/chat/chat.py +2 -13
- letschatty/models/chat/chat_with_assets.py +1 -6
- letschatty/models/chat/client.py +2 -0
- letschatty/models/chat/continuous_conversation.py +1 -1
- letschatty/models/company/CRM/funnel.py +33 -365
- letschatty/models/company/__init__.py +1 -7
- letschatty/models/company/assets/ai_agents_v2/ai_agents_decision_output.py +1 -1
- letschatty/models/company/assets/ai_agents_v2/chatty_ai_agent_in_chat.py +4 -0
- letschatty/models/company/assets/ai_agents_v2/chatty_ai_mode.py +2 -2
- letschatty/models/company/assets/ai_agents_v2/get_chat_with_prompt_response.py +1 -0
- letschatty/models/company/assets/ai_agents_v2/pre_qualify_config.py +28 -1
- letschatty/models/company/assets/automation.py +19 -10
- letschatty/models/company/assets/chat_assets.py +2 -3
- letschatty/models/company/assets/company_assets.py +0 -2
- letschatty/models/company/assets/sale.py +3 -3
- letschatty/models/company/empresa.py +1 -2
- letschatty/models/data_base/collection_interface.py +101 -29
- letschatty/models/data_base/mongo_connection.py +92 -9
- letschatty/models/messages/chatty_messages/schema/chatty_content/content_document.py +2 -4
- letschatty/models/messages/chatty_messages/schema/chatty_content/content_media.py +3 -4
- letschatty/models/utils/custom_exceptions/custom_exceptions.py +14 -1
- letschatty/services/ai_agents/smart_follow_up_context_builder_v2.py +5 -2
- letschatty/services/chat/chat_service.py +11 -47
- letschatty/services/chatty_assets/__init__.py +12 -0
- letschatty/services/chatty_assets/asset_service.py +190 -13
- letschatty/services/chatty_assets/assets_collections.py +137 -0
- letschatty/services/chatty_assets/base_container.py +3 -2
- letschatty/services/chatty_assets/base_container_with_collection.py +35 -26
- letschatty/services/chatty_assets/collections/__init__.py +38 -0
- letschatty/services/chatty_assets/collections/ai_agent_collection.py +19 -0
- letschatty/services/chatty_assets/collections/ai_agent_in_chat_collection.py +32 -0
- letschatty/services/chatty_assets/collections/ai_component_collection.py +21 -0
- letschatty/services/chatty_assets/collections/chain_of_thought_collection.py +30 -0
- letschatty/services/chatty_assets/collections/chat_collection.py +21 -0
- letschatty/services/chatty_assets/collections/contact_point_collection.py +21 -0
- letschatty/services/chatty_assets/collections/fast_answer_collection.py +21 -0
- letschatty/services/chatty_assets/collections/filter_criteria_collection.py +18 -0
- letschatty/services/chatty_assets/collections/flow_collection.py +20 -0
- letschatty/services/chatty_assets/collections/product_collection.py +20 -0
- letschatty/services/chatty_assets/collections/sale_collection.py +20 -0
- letschatty/services/chatty_assets/collections/source_collection.py +21 -0
- letschatty/services/chatty_assets/collections/tag_collection.py +19 -0
- letschatty/services/chatty_assets/collections/topic_collection.py +21 -0
- letschatty/services/chatty_assets/collections/user_collection.py +20 -0
- letschatty/services/chatty_assets/example_usage.py +44 -0
- letschatty/services/chatty_assets/services/__init__.py +37 -0
- letschatty/services/chatty_assets/services/ai_agent_in_chat_service.py +73 -0
- letschatty/services/chatty_assets/services/ai_agent_service.py +23 -0
- letschatty/services/chatty_assets/services/chain_of_thought_service.py +70 -0
- letschatty/services/chatty_assets/services/chat_service.py +25 -0
- letschatty/services/chatty_assets/services/contact_point_service.py +29 -0
- letschatty/services/chatty_assets/services/fast_answer_service.py +32 -0
- letschatty/services/chatty_assets/services/filter_criteria_service.py +30 -0
- letschatty/services/chatty_assets/services/flow_service.py +25 -0
- letschatty/services/chatty_assets/services/product_service.py +30 -0
- letschatty/services/chatty_assets/services/sale_service.py +25 -0
- letschatty/services/chatty_assets/services/source_service.py +28 -0
- letschatty/services/chatty_assets/services/tag_service.py +32 -0
- letschatty/services/chatty_assets/services/topic_service.py +31 -0
- letschatty/services/chatty_assets/services/user_service.py +32 -0
- letschatty/services/continuous_conversation_service/continuous_conversation_helper.py +11 -0
- letschatty/services/events/__init__.py +6 -0
- letschatty/services/events/events_manager.py +218 -1
- letschatty/services/factories/analytics/ai_agent_event_factory.py +161 -0
- letschatty/services/factories/analytics/events_factory.py +66 -30
- letschatty/services/factories/lambda_ai_orchestrartor/lambda_events_factory.py +46 -8
- letschatty/services/messages_helpers/get_caption_or_body_or_preview.py +6 -4
- letschatty/services/validators/analytics_validator.py +0 -11
- {letschatty-0.4.349.dist-info → letschatty-0.4.351.dist-info}/METADATA +1 -1
- {letschatty-0.4.349.dist-info → letschatty-0.4.351.dist-info}/RECORD +83 -53
- letschatty/models/analytics/events/chat_based_events/chat_client.py +0 -19
- letschatty/models/company/integrations/product_sync_status.py +0 -28
- letschatty/models/company/integrations/shopify/company_shopify_integration.py +0 -62
- letschatty/models/company/integrations/shopify/shopify_product_sync_status.py +0 -18
- letschatty/models/company/integrations/shopify/shopify_webhook_topics.py +0 -40
- letschatty/models/company/integrations/sync_status_enum.py +0 -9
- {letschatty-0.4.349.dist-info → letschatty-0.4.351.dist-info}/LICENSE +0 -0
- {letschatty-0.4.349.dist-info → letschatty-0.4.351.dist-info}/WHEEL +0 -0
|
@@ -16,7 +16,7 @@ class ChattyAIMode(StrEnum):
|
|
|
16
16
|
return {
|
|
17
17
|
cls.AUTONOMOUS: "El agente de IA tendrá la autonomía de conversar en tiempo real con el usuario, respetando sus instrucciones y las reglas establecidas.",
|
|
18
18
|
cls.SUGGESTIONS: "El agente de IA sugerirá sólo hará sugerencias de respuestas y seguimientos, pero no enviará mensajes ni interactuará de forma directa con el usuario.",
|
|
19
|
-
cls.COPILOT: "El agente de IA
|
|
19
|
+
cls.COPILOT: "El agente de IA responderá automáticamente cuando tenga alta confianza y la consulta esté dentro del alcance; si no, sugerirá o escalará para revisión humana.",
|
|
20
20
|
cls.OFF: "El agente de IA estará inactivo. No responderá al usuario ni hará sugerencias."
|
|
21
21
|
}[mode]
|
|
22
22
|
|
|
@@ -26,7 +26,7 @@ class ChattyAIMode(StrEnum):
|
|
|
26
26
|
mode_description = {
|
|
27
27
|
cls.AUTONOMOUS: "Only answer based on the context and rules provided. Do not improvise or make up information. If you can't handle the question, escalate to a human.",
|
|
28
28
|
cls.SUGGESTIONS: "You're only going to be making suggestions, all your messages will be reviewd by a human and you should add the reasoning to your chain of thought. If the user message is not worth answering, you can use the 'skip' action in your output. If the user message is worth answering, you NEED to use the 'suggest' action in your output. ",
|
|
29
|
-
cls.COPILOT: "You're in
|
|
29
|
+
cls.COPILOT: "You're in COPILOT mode. Use your confidence to decide the action: send when the request is within scope and you are confident, suggest when you're unsure or a human touch is needed (complex negotiation, frustration, high-value, or missing info), and escalate if it's required by control triggers. Always include a confidence score (0-100).",
|
|
30
30
|
cls.OFF: ""
|
|
31
31
|
}[mode]
|
|
32
32
|
return intro + "\n\n" + mode_description
|
|
@@ -25,6 +25,7 @@ class GetChatWithPromptResponse(BaseModel):
|
|
|
25
25
|
"messages": self.messages,
|
|
26
26
|
"n8n_agent_type": self.chatty_ai_agent.n8n_workspace_agent_type.value if self.chatty_ai_agent else None,
|
|
27
27
|
"n8n_agent_type_parameters": self.chatty_ai_agent.n8n_workspace_agent_type_parameteres.model_dump() if self.chatty_ai_agent else None,
|
|
28
|
+
"ai_agent_id": self.chatty_ai_agent.id if self.chatty_ai_agent else None,
|
|
28
29
|
"phone_number": self.chat.client.get_waid() if self.chat else None,
|
|
29
30
|
"chain_of_thought_id": self.chain_of_thought_id,
|
|
30
31
|
"trigger_id": self.trigger_id
|
|
@@ -5,11 +5,17 @@ Defines the data collection, acceptance criteria, and destination actions
|
|
|
5
5
|
for qualifying/disqualifying users.
|
|
6
6
|
"""
|
|
7
7
|
|
|
8
|
+
from letschatty.models.company.assets.automation import Automation
|
|
8
9
|
from pydantic import BaseModel, Field
|
|
9
10
|
from typing import Optional, List
|
|
10
11
|
from enum import StrEnum
|
|
11
12
|
from letschatty.models.utils.types.identifier import StrObjectId
|
|
12
13
|
|
|
14
|
+
class PostToExternalApiConfig(BaseModel):
|
|
15
|
+
"""Placeholder provisorio"""
|
|
16
|
+
url: str = Field(description="The URL to post to")
|
|
17
|
+
method: str = Field(description="The HTTP method to use")
|
|
18
|
+
api_key: str
|
|
13
19
|
|
|
14
20
|
class PreQualifyDestination(StrEnum):
|
|
15
21
|
"""
|
|
@@ -18,9 +24,21 @@ class PreQualifyDestination(StrEnum):
|
|
|
18
24
|
SUBSCRIBE_TO_LAUNCH = "subscribe_to_launch" # Subscribe to launch + welcome kit
|
|
19
25
|
CALENDAR_SCHEDULER = "calendar_scheduler" # Allow AI agent to schedule meetings
|
|
20
26
|
ESCALATE = "escalate" # Escalate to human
|
|
27
|
+
AUTO_ASSIGN_HUMAN_AGENT = "auto_assign_human_agent" # Auto-assign human agent
|
|
21
28
|
CUSTOM_MESSAGE = "custom_message" # Send a custom message
|
|
22
29
|
CONTINUE = "continue" # Continue normal AI agent flow
|
|
23
30
|
NONE = "none" # Do nothing
|
|
31
|
+
ARCHIVE = "archive" # Archive chat
|
|
32
|
+
POST_TO_EXTERNAL_API = "post_to_external_api" # Post result to external API
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
class PostToExternalApiConfig(BaseModel):
|
|
36
|
+
"""
|
|
37
|
+
Configuration for posting pre-qualification results to an external API.
|
|
38
|
+
"""
|
|
39
|
+
url: str = Field(description="Target URL for the external API")
|
|
40
|
+
method: str = Field(default="POST", description="HTTP method to use")
|
|
41
|
+
api_key: Optional[str] = Field(default=None, description="Optional API key for authentication")
|
|
24
42
|
|
|
25
43
|
|
|
26
44
|
class PreQualifyFormField(BaseModel):
|
|
@@ -68,6 +86,16 @@ class PreQualifyConfig(BaseModel):
|
|
|
68
86
|
default=None,
|
|
69
87
|
description="Custom message to send when user does NOT qualify (if destination is custom_message or escalate)"
|
|
70
88
|
)
|
|
89
|
+
post_to_external_api : Optional[PostToExternalApiConfig] = Field(
|
|
90
|
+
default=None,
|
|
91
|
+
description="Configuration for posting to an external API"
|
|
92
|
+
)
|
|
93
|
+
|
|
94
|
+
# Optional external API destination config
|
|
95
|
+
post_to_external_api: Optional[PostToExternalApiConfig] = Field(
|
|
96
|
+
default=None,
|
|
97
|
+
description="Config for POST_TO_EXTERNAL_API destination"
|
|
98
|
+
)
|
|
71
99
|
|
|
72
100
|
@property
|
|
73
101
|
def has_form_fields(self) -> bool:
|
|
@@ -108,4 +136,3 @@ class PreQualifyConfig(BaseModel):
|
|
|
108
136
|
original_len = len(self.form_fields)
|
|
109
137
|
self.form_fields = [f for f in self.form_fields if f.field_key != field_key]
|
|
110
138
|
return len(self.form_fields) < original_len
|
|
111
|
-
|
|
@@ -14,18 +14,27 @@ class Automation(BaseModel):
|
|
|
14
14
|
chatty_ai_agent_config: Optional[ChattyAIConfigForAutomation] = Field(default=None)
|
|
15
15
|
area: Optional[Area] = Field(default=None)
|
|
16
16
|
agent_id: Optional[StrObjectId] = Field(default=None)
|
|
17
|
-
chain_of_thought: Optional[str] = Field(default=None)
|
|
18
|
-
# Funnel transition automations
|
|
19
|
-
target_funnel_id: Optional[StrObjectId] = Field(
|
|
20
|
-
default=None,
|
|
21
|
-
description="Target funnel to move the chat to (for cross-funnel transitions)"
|
|
22
|
-
)
|
|
23
|
-
target_stage_id: Optional[StrObjectId] = Field(
|
|
24
|
-
default=None,
|
|
25
|
-
description="Target stage within the target funnel"
|
|
26
|
-
)
|
|
17
|
+
chain_of_thought : Optional[str] = Field(default=None)
|
|
27
18
|
# client_info: Optional[ClientInfo] = Field(default=None) me gustaría que levante el mail y/o otros atributos
|
|
28
19
|
|
|
20
|
+
@property
|
|
21
|
+
def has_automation(self) -> bool:
|
|
22
|
+
"""
|
|
23
|
+
Check if there's an actual automation defined (tags, products, or flow).
|
|
24
|
+
|
|
25
|
+
Returns:
|
|
26
|
+
bool: True if there's at least one tag, product, or flow defined
|
|
27
|
+
"""
|
|
28
|
+
return (
|
|
29
|
+
len(self.tags) > 0 or
|
|
30
|
+
len(self.products) > 0 or
|
|
31
|
+
len(self.flow) > 0 or
|
|
32
|
+
self.quality_score is not None or
|
|
33
|
+
self.chatty_ai_agent_config is not None or
|
|
34
|
+
self.area is not None or
|
|
35
|
+
self.highlight_description is not None
|
|
36
|
+
)
|
|
37
|
+
|
|
29
38
|
@model_validator(mode='after')
|
|
30
39
|
def check_agent_id(self):
|
|
31
40
|
if self.area == Area.WITH_AGENT and not self.agent_id:
|
|
@@ -10,7 +10,7 @@ from datetime import datetime
|
|
|
10
10
|
from zoneinfo import ZoneInfo
|
|
11
11
|
from bson import ObjectId
|
|
12
12
|
import json
|
|
13
|
-
from typing import Dict, Any, Optional
|
|
13
|
+
from typing import Dict, Any, Optional
|
|
14
14
|
from letschatty.models.utils.types.serializer_type import SerializerType
|
|
15
15
|
from letschatty.models.company.assets.ai_agents_v2.chatty_ai_mode import ChattyAIMode
|
|
16
16
|
|
|
@@ -67,8 +67,7 @@ class AssignedAssetToChat(BaseModel):
|
|
|
67
67
|
|
|
68
68
|
|
|
69
69
|
class SaleAssignedToChat(AssignedAssetToChat):
|
|
70
|
-
product_id:
|
|
71
|
-
product_ids: List[StrObjectId] = Field(default_factory=list)
|
|
70
|
+
product_id: StrObjectId = Field(frozen=True)
|
|
72
71
|
|
|
73
72
|
class ContactPointAssignedToChat(AssignedAssetToChat):
|
|
74
73
|
source_id: StrObjectId = Field(frozen=True)
|
|
@@ -5,7 +5,7 @@ from ...utils.types.identifier import StrObjectId
|
|
|
5
5
|
|
|
6
6
|
class Sale(CompanyAssetModel):
|
|
7
7
|
chat_id: StrObjectId
|
|
8
|
-
product_id:
|
|
8
|
+
product_id: StrObjectId
|
|
9
9
|
quantity: int
|
|
10
10
|
total_amount: float
|
|
11
11
|
currency: str
|
|
@@ -16,7 +16,7 @@ class Sale(CompanyAssetModel):
|
|
|
16
16
|
creator_id: StrObjectId
|
|
17
17
|
|
|
18
18
|
class SaleRequest(BaseModel):
|
|
19
|
-
product_id:
|
|
19
|
+
product_id: StrObjectId
|
|
20
20
|
quantity: int
|
|
21
21
|
creator_id: StrObjectId
|
|
22
22
|
total_amount: float
|
|
@@ -36,4 +36,4 @@ class SaleRequest(BaseModel):
|
|
|
36
36
|
"paid_amount": 100,
|
|
37
37
|
"installments": 1,
|
|
38
38
|
"details": {}
|
|
39
|
-
}
|
|
39
|
+
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
from letschatty.models.company.integrations.shopify.company_shopify_integration import ShopifyIntegration
|
|
2
1
|
from pydantic import Field, ConfigDict, field_validator, SecretStr, model_validator
|
|
3
2
|
from typing import Optional, List, Dict
|
|
4
3
|
|
|
@@ -35,7 +34,7 @@ class EmpresaModel(ChattyAssetModel):
|
|
|
35
34
|
continuous_conversation_template_name: Optional[str] = Field(default = None, description="The name of the continuous conversation template")
|
|
36
35
|
default_follow_up_strategy_id: Optional[StrObjectId] = Field(default = None, description="The id of the default follow up strategy")
|
|
37
36
|
messaging_settings: MessagingSettings = Field(default = MessagingSettings(), description="The messaging settings for the company")
|
|
38
|
-
|
|
37
|
+
|
|
39
38
|
|
|
40
39
|
model_config = ConfigDict(
|
|
41
40
|
validate_by_name=True,
|
|
@@ -4,6 +4,7 @@ from typing import TYPE_CHECKING, Dict, List, Generic, TypeVar, Type, Optional,
|
|
|
4
4
|
from bson.objectid import ObjectId
|
|
5
5
|
from pymongo.collection import Collection
|
|
6
6
|
from pymongo.database import Database
|
|
7
|
+
from motor.motor_asyncio import AsyncIOMotorDatabase, AsyncIOMotorCollection
|
|
7
8
|
|
|
8
9
|
from letschatty.models.chat.chat import Chat
|
|
9
10
|
from ...models.base_models.chatty_asset_model import ChattyAssetModel, CompanyAssetModel, ChattyAssetPreview
|
|
@@ -26,58 +27,116 @@ P = TypeVar('P', bound=ChattyAssetPreview)
|
|
|
26
27
|
class ChattyAssetCollectionInterface(Generic[T, P], ABC):
|
|
27
28
|
def __init__(self, database: str, collection: str, connection: MongoConnection, type: Type[T], preview_type: Optional[Type[P]] = None):
|
|
28
29
|
logger.info(f"Initializing collection {collection} in database {database}")
|
|
30
|
+
# Sync database and collection (existing)
|
|
29
31
|
self.db: Database = connection.client[database]
|
|
30
32
|
self.collection: Collection = connection.client[database][collection]
|
|
33
|
+
|
|
34
|
+
# NEW: Async database and collection
|
|
35
|
+
# Store connection reference to ensure we use current event loop
|
|
36
|
+
self._connection = connection
|
|
37
|
+
self._database_name = database
|
|
38
|
+
self._collection_name = collection
|
|
39
|
+
self._async_db: Optional[AsyncIOMotorDatabase] = None
|
|
40
|
+
self._async_collection: Optional[AsyncIOMotorCollection] = None
|
|
41
|
+
|
|
31
42
|
self.type = type
|
|
32
43
|
self.preview_type = preview_type
|
|
44
|
+
|
|
45
|
+
@property
|
|
46
|
+
def async_db(self) -> AsyncIOMotorDatabase:
|
|
47
|
+
"""Get async database, ensuring it uses the current event loop"""
|
|
48
|
+
# Always ensure connection's async client is using current loop (for Lambda compatibility)
|
|
49
|
+
self._connection._ensure_async_client_loop()
|
|
50
|
+
# Recreate database reference to ensure it uses the current client
|
|
51
|
+
self._async_db = self._connection.async_client[self._database_name]
|
|
52
|
+
return self._async_db
|
|
53
|
+
|
|
54
|
+
@property
|
|
55
|
+
def async_collection(self) -> AsyncIOMotorCollection:
|
|
56
|
+
"""Get async collection, ensuring it uses the current event loop"""
|
|
57
|
+
# Always ensure connection's async client is using current loop (for Lambda compatibility)
|
|
58
|
+
self._connection._ensure_async_client_loop()
|
|
59
|
+
# Recreate collection reference to ensure it uses the current client
|
|
60
|
+
self._async_collection = self._connection.async_client[self._database_name][self._collection_name]
|
|
61
|
+
return self._async_collection
|
|
33
62
|
@abstractmethod
|
|
34
63
|
def create_instance(self, data: dict) -> T:
|
|
35
64
|
"""Factory method to create instance from data"""
|
|
36
65
|
pass
|
|
37
66
|
|
|
38
|
-
|
|
67
|
+
# All methods are now async-only for better performance
|
|
68
|
+
async def insert(self, asset: T) -> StrObjectId:
|
|
69
|
+
"""Async insert operation"""
|
|
39
70
|
if not isinstance(asset, self.type):
|
|
40
71
|
raise ValueError(f"Asset must be of type {self.type.__name__}")
|
|
41
72
|
document = asset.model_dump_json(serializer=SerializerType.DATABASE)
|
|
42
73
|
logger.debug(f"Inserting document: {document}")
|
|
43
|
-
result = self.
|
|
74
|
+
result = await self.async_collection.insert_one(document)
|
|
44
75
|
if not result.inserted_id:
|
|
45
76
|
raise Exception("Failed to insert document")
|
|
46
77
|
logger.debug(f"Inserted document with id {result.inserted_id}")
|
|
47
78
|
return result.inserted_id
|
|
48
79
|
|
|
49
|
-
def update(self, asset: T) -> StrObjectId:
|
|
80
|
+
async def update(self, asset: T) -> StrObjectId:
|
|
81
|
+
"""Async update operation"""
|
|
50
82
|
logger.debug(f"Updating document with id {asset.id}")
|
|
51
83
|
if not isinstance(asset, self.type):
|
|
52
84
|
raise ValueError(f"Asset must be of type {self.type.__name__}")
|
|
53
85
|
asset.update_now()
|
|
54
86
|
document = asset.model_dump_json(serializer=SerializerType.DATABASE)
|
|
55
|
-
document.pop('_id', None)
|
|
56
|
-
result = self.
|
|
87
|
+
document.pop('_id', None)
|
|
88
|
+
result = await self.async_collection.update_one(
|
|
89
|
+
{"_id": ObjectId(asset.id)},
|
|
90
|
+
{"$set": document}
|
|
91
|
+
)
|
|
57
92
|
if result.matched_count == 0:
|
|
58
93
|
raise NotFoundError(f"No document found with id {asset.id}")
|
|
59
94
|
if result.modified_count == 0:
|
|
60
95
|
logger.debug(f"No changes were made to the document with id {asset.id} probably because the values were the same")
|
|
61
96
|
return asset.id
|
|
62
97
|
|
|
63
|
-
def get_by_id(self, doc_id: str) -> T:
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
98
|
+
async def get_by_id(self, doc_id: str) -> T:
|
|
99
|
+
"""Get by ID operation"""
|
|
100
|
+
logger.debug(f"Getting document with id {doc_id} from collection {self.async_collection.name}")
|
|
101
|
+
doc = await self.async_collection.find_one({"_id": ObjectId(doc_id)})
|
|
67
102
|
if doc:
|
|
68
103
|
return self.create_instance(doc)
|
|
69
104
|
else:
|
|
70
|
-
raise NotFoundError(f"No document found with id {doc_id} in
|
|
105
|
+
raise NotFoundError(f"No document found with id {doc_id} in collection")
|
|
71
106
|
|
|
72
|
-
def get_docs(self, company_id:Optional[StrObjectId], query
|
|
73
|
-
|
|
107
|
+
async def get_docs(self, company_id: Optional[StrObjectId], query={}, limit=0) -> List[T]:
|
|
108
|
+
"""Get multiple documents operation"""
|
|
109
|
+
logger.debug(f"Getting documents from collection with company_id {company_id} and query {query}")
|
|
74
110
|
if company_id:
|
|
75
|
-
query = query.copy()
|
|
111
|
+
query = query.copy()
|
|
76
112
|
query["company_id"] = company_id
|
|
77
|
-
|
|
78
|
-
|
|
113
|
+
cursor = self.async_collection.find(filter=query)
|
|
114
|
+
if limit:
|
|
115
|
+
cursor = cursor.limit(limit)
|
|
116
|
+
docs = await cursor.to_list(length=limit if limit > 0 else None)
|
|
117
|
+
logger.debug(f"Found {len(docs)} documents")
|
|
79
118
|
return [self.create_instance(doc) for doc in docs]
|
|
80
119
|
|
|
120
|
+
async def delete(self, doc_id: str, deletion_type: DeletionType = DeletionType.LOGICAL) -> StrObjectId:
|
|
121
|
+
"""Delete operation"""
|
|
122
|
+
logger.debug(f"Deleting document with id {doc_id} - deletion type: {deletion_type}")
|
|
123
|
+
if deletion_type == DeletionType.LOGICAL:
|
|
124
|
+
result = await self.async_collection.update_one(
|
|
125
|
+
{"_id": ObjectId(doc_id)},
|
|
126
|
+
{"$set": {"deleted_at": datetime.now(ZoneInfo("UTC")), "updated_at": datetime.now(ZoneInfo("UTC"))}}
|
|
127
|
+
)
|
|
128
|
+
if result.modified_count == 0:
|
|
129
|
+
raise NotFoundError(f"No document found with id {doc_id}")
|
|
130
|
+
return doc_id
|
|
131
|
+
elif deletion_type == DeletionType.PHYSICAL:
|
|
132
|
+
result = await self.async_collection.delete_one({"_id": ObjectId(doc_id)})
|
|
133
|
+
if result.deleted_count == 0:
|
|
134
|
+
raise NotFoundError(f"No document found with id {doc_id}")
|
|
135
|
+
return doc_id
|
|
136
|
+
else:
|
|
137
|
+
raise ValueError(f"Invalid deletion type: {deletion_type}")
|
|
138
|
+
|
|
139
|
+
# Additional methods - keeping these sync as they're less critical
|
|
81
140
|
def get_preview_docs(self, projection = {}, all=True) -> List[P]:
|
|
82
141
|
"""We get the previews of all the documents in the collection for all companies"""
|
|
83
142
|
if not self.preview_type:
|
|
@@ -98,18 +157,31 @@ class ChattyAssetCollectionInterface(Generic[T, P], ABC):
|
|
|
98
157
|
docs = self.collection.find(query)
|
|
99
158
|
return [self.create_instance(doc) for doc in docs]
|
|
100
159
|
|
|
101
|
-
def
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
160
|
+
async def get_by_ids(self, ids: List[StrObjectId]) -> List[T]:
|
|
161
|
+
"""
|
|
162
|
+
Get multiple assets by their IDs in a single query.
|
|
163
|
+
|
|
164
|
+
Args:
|
|
165
|
+
ids: List of asset IDs
|
|
166
|
+
|
|
167
|
+
Returns:
|
|
168
|
+
List of assets objects
|
|
169
|
+
"""
|
|
170
|
+
if not ids:
|
|
171
|
+
return []
|
|
172
|
+
|
|
173
|
+
# Convert string IDs to ObjectIds
|
|
174
|
+
object_ids = [ObjectId(id) for id in ids]
|
|
175
|
+
|
|
176
|
+
# Query for all filter criteria with matching IDs
|
|
177
|
+
query = {
|
|
178
|
+
"_id": {"$in": object_ids},
|
|
179
|
+
"deleted_at": None
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
# Use the sync collection directly (inherited from ChattyAssetCollectionInterface)
|
|
183
|
+
docs = await self.async_collection.find(query).to_list(length=None)
|
|
184
|
+
|
|
185
|
+
# Create FilterCriteria instances
|
|
186
|
+
return [self.create_instance(doc) for doc in docs]
|
|
115
187
|
|
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
from ..base_models.singleton import SingletonMeta
|
|
2
2
|
from pymongo import MongoClient
|
|
3
|
+
from motor.motor_asyncio import AsyncIOMotorClient
|
|
3
4
|
from typing import Optional
|
|
5
|
+
from urllib.parse import quote_plus
|
|
4
6
|
import os
|
|
5
7
|
import atexit
|
|
8
|
+
import asyncio
|
|
9
|
+
import logging
|
|
10
|
+
|
|
11
|
+
logger = logging.getLogger(__name__)
|
|
6
12
|
|
|
7
13
|
class MongoConnection(metaclass=SingletonMeta):
|
|
8
14
|
def __init__(
|
|
@@ -10,26 +16,103 @@ class MongoConnection(metaclass=SingletonMeta):
|
|
|
10
16
|
username: Optional[str] = None,
|
|
11
17
|
password: Optional[str] = None,
|
|
12
18
|
uri_base: Optional[str] = None,
|
|
13
|
-
instance: Optional[str] = None
|
|
19
|
+
instance: Optional[str] = None,
|
|
20
|
+
verify_on_init: bool = True
|
|
14
21
|
):
|
|
15
22
|
self.username = username or os.getenv('MONGO_USERNAME')
|
|
16
23
|
self.password = password or os.getenv('MONGO_PASSWORD')
|
|
17
24
|
self.uri_base = uri_base or os.getenv('MONGO_URI_BASE')
|
|
18
25
|
self.instance = instance or os.getenv('MONGO_INSTANCE_COMPONENT')
|
|
19
|
-
|
|
26
|
+
|
|
20
27
|
if not all([self.username, self.password, self.uri_base, self.instance]):
|
|
21
28
|
raise ValueError("Missing required MongoDB connection parameters")
|
|
22
|
-
|
|
23
|
-
|
|
29
|
+
|
|
30
|
+
# URL-encode username and password to handle special characters per RFC 3986
|
|
31
|
+
encoded_username = quote_plus(self.username)
|
|
32
|
+
encoded_password = quote_plus(self.password)
|
|
33
|
+
|
|
34
|
+
uri = f"{self.uri_base}://{encoded_username}:{encoded_password}@{self.instance}.mongodb.net"
|
|
35
|
+
|
|
36
|
+
# Sync client (existing)
|
|
24
37
|
self.client = MongoClient(uri)
|
|
38
|
+
|
|
39
|
+
# NEW: Async client for async operations
|
|
40
|
+
# Don't pass io_loop - Motor will automatically use the current event loop
|
|
41
|
+
# This is important for Lambda where the event loop changes between invocations
|
|
42
|
+
self.async_client = AsyncIOMotorClient(uri)
|
|
43
|
+
|
|
44
|
+
# Verify connections if requested
|
|
45
|
+
if verify_on_init:
|
|
46
|
+
try:
|
|
47
|
+
# Try to get running loop
|
|
48
|
+
loop = asyncio.get_running_loop()
|
|
49
|
+
# If we get here, there's a running loop
|
|
50
|
+
logger.warning(
|
|
51
|
+
"Event loop is already running. Skipping connection verification in __init__. "
|
|
52
|
+
"Call verify_connection_async() from async context to verify connection."
|
|
53
|
+
)
|
|
54
|
+
self._connection_verified = False
|
|
55
|
+
except RuntimeError:
|
|
56
|
+
# No running loop, safe to use run_until_complete
|
|
57
|
+
try:
|
|
58
|
+
# Test sync client
|
|
59
|
+
self.client.admin.command('ping')
|
|
60
|
+
|
|
61
|
+
# Test async client in sync context
|
|
62
|
+
loop = asyncio.new_event_loop()
|
|
63
|
+
asyncio.set_event_loop(loop)
|
|
64
|
+
loop.run_until_complete(self.async_client.admin.command('ping'))
|
|
65
|
+
self._connection_verified = True
|
|
66
|
+
loop.close()
|
|
67
|
+
except Exception as e:
|
|
68
|
+
self.client.close()
|
|
69
|
+
self.async_client.close()
|
|
70
|
+
raise ConnectionError(f"Failed to connect to MongoDB: {str(e)}")
|
|
71
|
+
else:
|
|
72
|
+
self._connection_verified = False
|
|
73
|
+
|
|
74
|
+
atexit.register(self.close)
|
|
75
|
+
|
|
76
|
+
def _ensure_async_client_loop(self):
|
|
77
|
+
"""Ensure async client is using the current event loop (for Lambda compatibility)"""
|
|
25
78
|
try:
|
|
26
|
-
|
|
79
|
+
current_loop = asyncio.get_running_loop()
|
|
80
|
+
# Check if client's loop is closed or different
|
|
81
|
+
client_loop = getattr(self.async_client, '_io_loop', None)
|
|
82
|
+
if client_loop is not None:
|
|
83
|
+
try:
|
|
84
|
+
# Try to check if the loop is closed
|
|
85
|
+
if client_loop.is_closed():
|
|
86
|
+
# Recreate client with current loop
|
|
87
|
+
logger.warning("Async client's event loop is closed, recreating client")
|
|
88
|
+
old_client = self.async_client
|
|
89
|
+
uri = f"{self.uri_base}://{quote_plus(self.username)}:{quote_plus(self.password)}@{self.instance}.mongodb.net"
|
|
90
|
+
self.async_client = AsyncIOMotorClient(uri)
|
|
91
|
+
try:
|
|
92
|
+
old_client.close()
|
|
93
|
+
except:
|
|
94
|
+
pass
|
|
95
|
+
except AttributeError:
|
|
96
|
+
# _io_loop might not exist in newer Motor versions
|
|
97
|
+
pass
|
|
98
|
+
except RuntimeError:
|
|
99
|
+
# No running loop, which is fine - Motor will handle it
|
|
100
|
+
pass
|
|
101
|
+
|
|
102
|
+
async def verify_connection_async(self) -> bool:
|
|
103
|
+
"""Verify MongoDB connection asynchronously. Safe to call from async context."""
|
|
104
|
+
try:
|
|
105
|
+
# Ensure we're using the current event loop
|
|
106
|
+
self._ensure_async_client_loop()
|
|
107
|
+
await self.async_client.admin.command('ping')
|
|
108
|
+
self._connection_verified = True
|
|
109
|
+
return True
|
|
27
110
|
except Exception as e:
|
|
28
|
-
|
|
29
|
-
raise ConnectionError(f"Failed to
|
|
111
|
+
logger.error(f"Failed to verify MongoDB connection: {e}")
|
|
112
|
+
raise ConnectionError(f"Failed to verify MongoDB connection: {e}")
|
|
30
113
|
|
|
31
|
-
atexit.register(self.close)
|
|
32
|
-
|
|
33
114
|
def close(self) -> None:
|
|
34
115
|
if hasattr(self, 'client'):
|
|
35
116
|
self.client.close()
|
|
117
|
+
if hasattr(self, 'async_client'):
|
|
118
|
+
self.async_client.close()
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
from pydantic import BaseModel, Field, model_validator, ValidationInfo
|
|
2
2
|
from typing import Optional
|
|
3
|
-
from urllib.parse import urlparse, unquote
|
|
4
3
|
from .content_media import ChattyContentMedia
|
|
5
4
|
|
|
6
5
|
class ChattyContentDocument(ChattyContentMedia):
|
|
@@ -9,6 +8,5 @@ class ChattyContentDocument(ChattyContentMedia):
|
|
|
9
8
|
@model_validator(mode='before')
|
|
10
9
|
def validate_filename(cls, data: dict, info: ValidationInfo):
|
|
11
10
|
if not data.get("filename") and data.get("url"):
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
return data
|
|
11
|
+
data["filename"] = data["url"].split("/")[-1]
|
|
12
|
+
return data
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
from pydantic import BaseModel, Field, field_validator, HttpUrl
|
|
2
2
|
from typing import Optional
|
|
3
|
-
from urllib.parse import quote
|
|
4
3
|
class ChattyContentMedia(BaseModel):
|
|
5
4
|
id: Optional[str] = Field(description="Unique identifier for the image. Also known as media_id", default="")
|
|
6
5
|
url: str = Field(description="URL of the media from S3")
|
|
@@ -12,9 +11,9 @@ class ChattyContentMedia(BaseModel):
|
|
|
12
11
|
def validate_url(cls, v):
|
|
13
12
|
if not v:
|
|
14
13
|
raise ValueError("URL is required")
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
return encoded
|
|
14
|
+
HttpUrl(v)
|
|
15
|
+
return v
|
|
18
16
|
|
|
19
17
|
def get_body_or_caption(self) -> str:
|
|
20
18
|
return self.caption
|
|
19
|
+
|
|
@@ -5,6 +5,7 @@ import json
|
|
|
5
5
|
from datetime import timedelta
|
|
6
6
|
|
|
7
7
|
from letschatty.models.utils.definitions import Area
|
|
8
|
+
from pydantic_core.core_schema import custom_error_schema
|
|
8
9
|
logger = logging.getLogger("logger")
|
|
9
10
|
|
|
10
11
|
class Context(BaseModel):
|
|
@@ -229,4 +230,16 @@ class OpenAIError(CustomException):
|
|
|
229
230
|
|
|
230
231
|
class NewerAvailableMessageToBeProcessedByAiAgent(CustomException):
|
|
231
232
|
def __init__(self, message="Duplicated incoming message call for ai agent", status_code=400, **context_data):
|
|
232
|
-
super().__init__(message, status_code=status_code, **context_data)
|
|
233
|
+
super().__init__(message, status_code=status_code, **context_data)
|
|
234
|
+
|
|
235
|
+
class MissingAIAgentInChat(CustomException):
|
|
236
|
+
def __init__(self, message="Missing AI agent in chat", status_code=400, **context_data):
|
|
237
|
+
super().__init__(message, status_code=status_code, **context_data)
|
|
238
|
+
|
|
239
|
+
class ChattyAIModeOff(CustomException):
|
|
240
|
+
def __init__(self, message="Chatty AI agent is in OFF mode", status_code=400, **context_data):
|
|
241
|
+
super().__init__(message, status_code=status_code, **context_data)
|
|
242
|
+
|
|
243
|
+
class ChatWithActiveContinuousConversation(CustomException):
|
|
244
|
+
def __init__(self, message="Chat has active continuous conversation", status_code=400, **context_data):
|
|
245
|
+
super().__init__(message, status_code=status_code, **context_data)
|
|
@@ -14,13 +14,16 @@ class SmartFollowUpContextBuilder(ContextBuilder):
|
|
|
14
14
|
|
|
15
15
|
@staticmethod
|
|
16
16
|
def check_minimum_time_since_last_message(chat: Chat, follow_up_strategy: FollowUpStrategy,smart_follow_up_state: FlowStateAssignedToChat) -> bool:
|
|
17
|
-
|
|
17
|
+
# consecutive_count is 0-indexed (0 = no follow-ups sent yet), but get_interval_for_followup expects 1-indexed
|
|
18
|
+
# So we add 1 to get the interval for the follow-up we're about to send
|
|
19
|
+
next_followup_number = smart_follow_up_state.consecutive_count + 1
|
|
20
|
+
expected_interval_minutes = follow_up_strategy.get_interval_for_followup(next_followup_number)
|
|
18
21
|
last_message_timestamp = chat.last_message_timestamp
|
|
19
22
|
if last_message_timestamp is None:
|
|
20
23
|
raise HumanInterventionRequired("There's no last message in the chat, can't validate the minimum time since last message for the smart follow up")
|
|
21
24
|
time_since_last_message = datetime.now(ZoneInfo('UTC')) - last_message_timestamp
|
|
22
25
|
if time_since_last_message.total_seconds() < expected_interval_minutes * 60:
|
|
23
|
-
raise PostponeFollowUp(time_delta= timedelta(seconds=expected_interval_minutes * 60 - time_since_last_message.total_seconds()), message=f"Se pospuso el Smart Follow Up porque no ha pasado el tiempo mínimo esperado de {expected_interval_minutes/60} horas para el seguimiento #{
|
|
26
|
+
raise PostponeFollowUp(time_delta= timedelta(seconds=expected_interval_minutes * 60 - time_since_last_message.total_seconds()), message=f"Se pospuso el Smart Follow Up porque no ha pasado el tiempo mínimo esperado de {expected_interval_minutes/60} horas para el seguimiento #{next_followup_number}")
|
|
24
27
|
return True
|
|
25
28
|
|
|
26
29
|
|