letschatty 0.4.340__tar.gz → 0.4.341__tar.gz

{letschatty-0.4.340 → letschatty-0.4.341}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: letschatty
-Version: 0.4.340
+Version: 0.4.341
 Summary: Models and custom classes to work across the Chattyverse
 License: MIT
 Author: Axel

{letschatty-0.4.340 → letschatty-0.4.341}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "letschatty"
-version = "0.4.340"  # Or whichever is your latest version
+version = "0.4.341"  # Or whichever is your latest version
 description = "Models and custom classes to work across the Chattyverse"
 authors = ["Axel <axel@letschatty.com>"]
 license = "MIT"

{letschatty-0.4.340 → letschatty-0.4.341}/src/letschatty/models/chat/chat.py

@@ -269,7 +269,17 @@ class Chat(CompanyAssetModel):
     @property
     def bought_product_ids(self) -> List[StrObjectId]:
         """Get all sale ids in the chat"""
-        return [sale.product_id for sale in self.sales]
+        product_ids: List[StrObjectId] = []
+        for sale in self.sales:
+            sale_product_ids = getattr(sale, "product_ids", None)
+            if sale_product_ids:
+                for product_id in sale_product_ids:
+                    if product_id not in product_ids:
+                        product_ids.append(product_id)
+            elif sale.product_id:
+                if sale.product_id not in product_ids:
+                    product_ids.append(sale.product_id)
+        return product_ids
 
     @property
     def products(self) -> List[AssignedAssetToChat]:
@@ -366,4 +376,3 @@ class Chat(CompanyAssetModel):
             dump["last_message"] = self.last_message.model_dump_json(serializer=SerializerType.DATABASE) if self.last_message else None
             dump["flow_states"] = [flow_state.model_dump_json(serializer=SerializerType.DATABASE) for flow_state in self.flow_states]
         return dump
-

{letschatty-0.4.340 → letschatty-0.4.341}/src/letschatty/models/company/assets/ai_agents_v2/chain_of_thought_in_chat.py

@@ -84,12 +84,13 @@ class ChainOfThoughtInChatPreview(ChattyAssetPreview):
     # trigger_id removed - trigger info is in: incoming_message_ids for user_message,
     # triggered_by_user_id for manual_trigger, smart_follow_up_id for follow_up
     chain_of_thought : Optional[str] = Field(default=None, description="The chain of thought")
+    confidence: Optional[int] = Field(default=None, ge=0, le=100, description="Confidence 0-100")
     status: Optional[ChainOfThoughtInChatStatus] = Field(default=None, description="The status of the chain of thought")
     name: str = Field(description="A title for the chain of thought")
 
     @classmethod
     def get_projection(cls) -> dict[str, Any]:
-        return super().get_projection() | {"chat_id": 1, "trigger": 1, "chain_of_thought": 1, "name": 1, "status": 1}
+        return super().get_projection() | {"chat_id": 1, "trigger": 1, "chain_of_thought": 1, "confidence": 1, "name": 1, "status": 1}
 
     @classmethod
     def from_dict(cls, data: dict) -> 'ChainOfThoughtInChatPreview':
@@ -103,6 +104,7 @@ class ChainOfThoughtInChatPreview(ChattyAssetPreview):
             chat_id=asset.chat_id,
             trigger=asset.trigger,
             chain_of_thought=asset.chain_of_thought,
+            confidence=asset.confidence,
             status=asset.status,
             company_id=asset.company_id,
             created_at=asset.created_at,
@@ -121,6 +123,7 @@ class ChainOfThoughtInChat(CompanyAssetModel):
     chatty_ai_agent_id : StrObjectId = Field(description="The chatty ai agent id")
     chatty_ai_agent : Dict[str, Any] = Field(description="The chatty ai agent at the moment of triggering the chain of thought", exclude=True,default_factory=dict)
     chain_of_thought : Optional[str] = Field(default=None, description="The chain of thought")
+    confidence: Optional[int] = Field(default=None, ge=0, le=100, description="Confidence 0-100")
     name: str = Field(description="A title for the chain of thought", alias="title")
     preview_class: ClassVar[Type[ChattyAssetPreview]] = ChainOfThoughtInChatPreview
 
@@ -128,5 +131,4 @@ class ChainOfThoughtInChat(CompanyAssetModel):
         if self.chain_of_thought is None:
             self.chain_of_thought = cot
         else:
-            self.chain_of_thought += f"\n{cot}"
-
+            self.chain_of_thought += f"\n{cot}"

{letschatty-0.4.340 → letschatty-0.4.341}/src/letschatty/models/company/assets/chat_assets.py

@@ -10,7 +10,7 @@ from datetime import datetime
 from zoneinfo import ZoneInfo
 from bson import ObjectId
 import json
-from typing import Dict, Any, Optional
+from typing import Dict, Any, Optional, List
 from letschatty.models.utils.types.serializer_type import SerializerType
 from letschatty.models.company.assets.ai_agents_v2.chatty_ai_mode import ChattyAIMode
 
@@ -67,7 +67,8 @@ class AssignedAssetToChat(BaseModel):
 
 
 class SaleAssignedToChat(AssignedAssetToChat):
-    product_id: StrObjectId = Field(frozen=True)
+    product_id: Optional[StrObjectId] = Field(default=None)
+    product_ids: List[StrObjectId] = Field(default_factory=list)
 
 class ContactPointAssignedToChat(AssignedAssetToChat):
     source_id: StrObjectId = Field(frozen=True)

{letschatty-0.4.340 → letschatty-0.4.341}/src/letschatty/models/company/assets/sale.py

@@ -5,7 +5,7 @@ from ...utils.types.identifier import StrObjectId
 
 class Sale(CompanyAssetModel):
     chat_id: StrObjectId
-    product_id: StrObjectId
+    product_id: Optional[StrObjectId] = Field(default=None)
     quantity: int
     total_amount: float
     currency: str
@@ -16,7 +16,7 @@ class Sale(CompanyAssetModel):
     creator_id: StrObjectId
 
 class SaleRequest(BaseModel):
-    product_id: StrObjectId
+    product_id: Optional[StrObjectId] = Field(default=None)
     quantity: int
     creator_id: StrObjectId
     total_amount: float
@@ -36,4 +36,4 @@ class SaleRequest(BaseModel):
             "paid_amount": 100,
             "installments": 1,
             "details": {}
-        }
+        }

letschatty-0.4.341/src/letschatty/models/company/integrations/shopify/shopify_product_sync_status.py

@@ -0,0 +1,42 @@
+from enum import Enum
+from typing import Optional
+from datetime import datetime
+from zoneinfo import ZoneInfo
+from pydantic import Field
+from letschatty.models.base_models import CompanyAssetModel
+
+
+class ShopifyProductSyncStatusEnum(str, Enum):
+    """Status enum for Shopify product sync operations"""
+    STARTED = "started"
+    RUNNING = "running"
+    FINISHED = "finished"
+    FAILED = "failed"
+
+
+class ShopifyProductSyncStatus(CompanyAssetModel):
+    """Tracks the status and results of Shopify product synchronization operations.
+    
+    Each sync operation creates a new document in the collection with its own status,
+    timestamps, and product counts.
+    """
+    name: str = Field(
+        default="",
+        description="Name/identifier for this sync operation"
+    )
+    status: ShopifyProductSyncStatusEnum = Field(
+        default=ShopifyProductSyncStatusEnum.STARTED,
+        description="Current sync status"
+    )
+    finished_at: Optional[datetime] = Field(
+        default=None,
+        description="Timestamp when sync finished"
+    )
+    products_created: int = Field(
+        default=0,
+        description="Number of products created during sync"
+    )
+    products_updated: int = Field(
+        default=0,
+        description="Number of products updated during sync"
+    )

{letschatty-0.4.340 → letschatty-0.4.341}/src/letschatty/services/chat/chat_service.py

@@ -285,36 +285,46 @@ class ChatService:
         return next((state for state in chat.flow_states if state.is_smart_follow_up), None)
 
     @staticmethod
-    def create_sale(chat : Chat, execution_context: ExecutionContext, sale : Sale, product : Product) -> SaleAssignedToChat:
+    def create_sale(
+        chat: Chat,
+        execution_context: ExecutionContext,
+        sale: Sale,
+        product: Optional[Product],
+        product_ids: Optional[List[StrObjectId]] = None,
+        product_label: Optional[str] = None
+    ) -> SaleAssignedToChat:
         """
         Add a sale to the chat.
         """
         if next((sale for sale in chat.client.sales if sale.asset_id == sale.id), None) is not None:
             raise AssetAlreadyAssigned(f"Sale with id {sale.id} already assigned to chat {chat.id}")
+        label = product_label or (product.name if product else "multiples productos")
+        assigned_product_ids = product_ids or ([product.id] if product else [])
         assigned_asset = SaleAssignedToChat(
             asset_type=ChatAssetType.SALE,
             asset_id=sale.id,
             assigned_at=sale.created_at,
             assigned_by=execution_context.executor.id,
-            product_id=product.id
+            product_id=product.id if product else None,
+            product_ids=assigned_product_ids
         )
         execution_context.set_event_time(assigned_asset.assigned_at)
         bisect.insort(chat.client.sales, assigned_asset)
-        ChatService.create_highlight(chat=chat, execution_context=execution_context, highlight_data=HighlightRequestData(title=f"🛍️ Venta de {product.name}", description=f"Venta de {product.name} creada por {execution_context.executor.name}", starred=False, subtype=MessageSubtype.SALE_ADDED))
-        ChatService.add_central_notification_from_text(chat=chat, body=f"Venta de {product.name} agregada al chat {chat.id} por {execution_context.executor.name}", subtype=MessageSubtype.SALE_ADDED)
+        ChatService.create_highlight(chat=chat, execution_context=execution_context, highlight_data=HighlightRequestData(title=f"🛍️ Venta de {label}", description=f"Venta de {label} creada por {execution_context.executor.name}", starred=False, subtype=MessageSubtype.SALE_ADDED))
+        ChatService.add_central_notification_from_text(chat=chat, body=f"Venta de {label} agregada al chat {chat.id} por {execution_context.executor.name}", subtype=MessageSubtype.SALE_ADDED)
         return assigned_asset
 
     @staticmethod
-    def update_sale(chat : Chat, execution_context: ExecutionContext, sale : Sale, product : Product) -> Sale:
+    def update_sale(chat: Chat, execution_context: ExecutionContext, sale: Sale, product_label: str) -> Sale:
         """
         Update a sale for the chat.
         """
-        ChatService.create_highlight(chat=chat, execution_context=execution_context, highlight_data=HighlightRequestData(title=f"🛍️ Venta actualizada de {product.name}", description=f"Venta de {product.name} actualizada por {execution_context.executor.name}", starred=False, subtype=MessageSubtype.SALE_UPDATED))
-        ChatService.add_central_notification_from_text(chat=chat, body=f"Venta de {product.name} actualizada en el chat {chat.id} por {execution_context.executor.name}", subtype=MessageSubtype.SALE_UPDATED)
+        ChatService.create_highlight(chat=chat, execution_context=execution_context, highlight_data=HighlightRequestData(title=f"🛍️ Venta actualizada de {product_label}", description=f"Venta de {product_label} actualizada por {execution_context.executor.name}", starred=False, subtype=MessageSubtype.SALE_UPDATED))
+        ChatService.add_central_notification_from_text(chat=chat, body=f"Venta de {product_label} actualizada en el chat {chat.id} por {execution_context.executor.name}", subtype=MessageSubtype.SALE_UPDATED)
         return sale
 
     @staticmethod
-    def delete_sale(chat : Chat, execution_context: ExecutionContext, sale_id : StrObjectId, product : Product) -> SaleAssignedToChat:
+    def delete_sale(chat: Chat, execution_context: ExecutionContext, sale_id: StrObjectId, product_label: str) -> SaleAssignedToChat:
         """
         Logically remove a sale from the chat.
         """
@@ -322,8 +332,8 @@ class ChatService:
             assigned_asset_to_remove = next(sale for sale in chat.client.sales if sale.asset_id == sale_id)
             chat.client.sales.remove(assigned_asset_to_remove)
             execution_context.set_event_time(datetime.now(tz=ZoneInfo("UTC")))
-            ChatService.create_highlight(chat=chat, execution_context=execution_context, highlight_data=HighlightRequestData(title=f"🛍️ Venta eliminada de {product.name}", description=f"Venta de {product.name} eliminada por {execution_context.executor.name}", starred=False, subtype=MessageSubtype.SALE_DELETED))
-            ChatService.add_central_notification_from_text(chat=chat, body=f"Venta de {product.name} eliminada del chat {chat.id} por {execution_context.executor.name}", subtype=MessageSubtype.SALE_DELETED)
+            ChatService.create_highlight(chat=chat, execution_context=execution_context, highlight_data=HighlightRequestData(title=f"🛍️ Venta eliminada de {product_label}", description=f"Venta de {product_label} eliminada por {execution_context.executor.name}", starred=False, subtype=MessageSubtype.SALE_DELETED))
+            ChatService.add_central_notification_from_text(chat=chat, body=f"Venta de {product_label} eliminada del chat {chat.id} por {execution_context.executor.name}", subtype=MessageSubtype.SALE_DELETED)
             return assigned_asset_to_remove
         except StopIteration:
             raise NotFoundError(message=f"Sale with id {sale_id} not found in chat {chat.id}")

{letschatty-0.4.340 → letschatty-0.4.341}/src/letschatty/services/validators/analytics_validator.py

@@ -10,6 +10,10 @@ if TYPE_CHECKING:
 
 class SourcesAndTopicsValidator:
     """This class provides methods to validate sources and topics."""
+    @staticmethod
+    def normalize_source_name(name: str) -> str:
+        return name.strip().lower()
+
     @staticmethod
     def source_validation_check(sources : Dict[str,Source], topics : Dict[str,Topic], source : Source, existing_source_id : str | None = None) -> None:
         """Checks validation of a source against other sources and topics."""
@@ -28,9 +32,16 @@ class SourcesAndTopicsValidator:
         """This method checks that no duplicated source is created.
         For Pure Ads, it checks that the ad_id is unique and doesn't exist already.
         For Other Sources, it checks that exact trigger doesn't exist already. """
+        normalized_name = SourcesAndTopicsValidator.normalize_source_name(source.name)
+        existing_source_name = None
+        if existing_source_id and existing_source_id in sources:
+            existing_source_name = SourcesAndTopicsValidator.normalize_source_name(sources[existing_source_id].name)
+        should_check_name = existing_source_name is None or normalized_name != existing_source_name
         for source_id, source_to_check in sources.items():
             if source_id == existing_source_id:
                 continue
+            if should_check_name and SourcesAndTopicsValidator.normalize_source_name(source_to_check.name) == normalized_name:
+                raise ConflictedSource(f":warning: *Conflict while adding source: Name already exists* \n New source '{source.name}' \n- Id {source.id} \n Existing source '{source_to_check.name}' \n- Id {source_to_check.id}", conflicting_source_id=source_to_check.id)
             if source == source_to_check: #type: ignore
                 if isinstance(source, OtherSource):
                     raise ConflictedSource(f":warning: *Conflict while adding source: Trigger already exists* \n New source '{source.name}' \n- Id {source.id} \n- Trigger {source.trigger[:30]} \n Existing source '{source_to_check.name}' \n- Id {source_to_check.id} \n- Trigger '{source_to_check.trigger[:30]}'", conflicting_source_id=source_to_check.id)