agentstr 0.1.11__py3-none-any.whl → 0.1.12__py3-none-any.whl

agentstr/{marketplace.py → merchant.py}

@@ -1,288 +1,22 @@
-import ast
 import json
 import logging
-import re
-from typing import Any, Dict, List, Optional, Tuple, Union, cast
-
-from agentstr.nostr import (
-    EventId,
-    Keys,
-    NostrClient,
-    ProductData,
-    ShippingCost,
-    ShippingMethod,
-    StallData,
-)
+import time
+from typing import Any, List, Optional, Tuple, Union
+
+from agentstr.models import AgentProfile, MerchantProduct, MerchantStall
+from agentstr.nostr import EventId, NostrClient
 
 try:
-    from phi.tools import Toolkit
+    from agno.tools import Toolkit
 except ImportError:
-    raise ImportError(
-        "`phidata` not installed. Please install using `pip install phidata`"
-    )
-
-from pydantic import BaseModel, ConfigDict, Field, validate_call
-
-
-class Profile:
-
-    logger = logging.getLogger("Profile")
-    WEB_URL: str = "https://primal.net/p/"
-
-    def __init__(self, name: str, about: str, picture: str, nsec: Optional[str] = None):
-        """Initialize the profile.
-
-        Args:
-            name: Name for the merchant
-            about: brief description about the merchant
-            picture: url to a png file with a picture for the merchant
-            nsec: optional private key to be used by this Merchant
-        """
-
-        # Set log handling for MerchantProfile
-        if not Profile.logger.hasHandlers():
-            console_handler = logging.StreamHandler()
-            console_handler.setLevel(logging.INFO)
-            formatter = logging.Formatter(
-                "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
-            )
-            console_handler.setFormatter(formatter)
-            Profile.logger.addHandler(console_handler)
-
-        self.name = name
-        self.about = about
-        self.picture = picture
-
-        if nsec:
-            self.private_key = nsec
-            keys = Keys.parse(self.private_key)
-            self.public_key = keys.public_key().to_bech32()
-            Profile.logger.info(
-                f"Pre-defined private key reused for {self.name}: {self.private_key}"
-            )
-            Profile.logger.info(
-                f"Pre-defined public key reused for {self.name}: {self.public_key}"
-            )
-        else:
-            keys = Keys.generate()
-            self.private_key = keys.secret_key().to_bech32()
-            self.public_key = keys.public_key().to_bech32()
-            Profile.logger.info(
-                f"New private key created for {self.name}: {self.private_key}"
-            )
-            Profile.logger.info(
-                f"New public key created for {self.name}: {self.public_key}"
-            )
-
-        self.url = str(self.WEB_URL) + str(self.public_key)
-
-    def __str__(self) -> str:
-        return (
-            "Merchant Profile:\n"
-            "Name = {}\n"
-            "Description = {}\n"
-            "Picture = {}\n"
-            "URL = {}\n"
-            "Private key = {}\n"
-            "Public key = {}".format(
-                self.name,
-                self.about,
-                self.picture,
-                self.url,
-                self.private_key,
-                self.public_key,
-            )
-        )
-
-    def to_dict(self) -> dict:
-        return {
-            "name": self.name,
-            "description": self.about,
-            "picture": self.picture,
-            "public key": self.public_key,
-            "private key": self.private_key,
-        }
-
-    def get_about(self) -> str:
-        """
-        Returns a description of the Merchant
-
-        Returns:
-            str: description of the Merchant
-        """
-        return self.about
-
-    def get_name(self) -> str:
-        """
-        Returns the Merchant's name
+    raise ImportError("`agno` not installed. Please install using `pip install agno`")
 
-        Returns:
-            str: Merchant's name
-        """
-        return self.name
-
-    def get_picture(self) -> str:
-        """
-        Returns the picture associated with the Merchant.
-
-        Returns:
-            str: URL to the picture associated with the Merchant
-        """
-        return self.picture
-
-    def get_private_key(self) -> str:
-        """
-        Returns the private key.
-
-        Returns:
-            str: private key in bech32 format
-        """
-        return str(self.private_key)
-
-    def get_public_key(self) -> str:
-        """
-        Returns the public key.
+from pydantic import BaseModel, ConfigDict
 
-        Returns:
-            str: public key in bech32 format
-        """
-        return str(self.public_key)
-
-    def get_url(self) -> str:
-        return str(self.url)
-
-
-class MerchantProduct(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True)
-
-    id: str
-    stall_id: str
-    name: str
-    description: str
-    images: List[str]
-    currency: str
-    price: float
-    quantity: int
-    shipping: List[ShippingCost]
-    categories: Optional[List[str]] = []
-    specs: Optional[List[List[str]]] = []
-
-    @classmethod
-    def from_product_data(cls, product: ProductData) -> "MerchantProduct":
-        return cls(
-            id=product.id,
-            stall_id=product.stall_id,
-            name=product.name,
-            description=product.description,
-            images=product.images,
-            currency=product.currency,
-            price=product.price,
-            quantity=product.quantity,
-            shipping=product.shipping,
-            categories=product.categories if product.categories is not None else [],
-            specs=product.specs if product.specs is not None else [],
-        )
-
-    def to_product_data(self) -> ProductData:
-        return ProductData(
-            id=self.id,
-            stall_id=self.stall_id,
-            name=self.name,
-            description=self.description,
-            images=self.images,
-            currency=self.currency,
-            price=self.price,
-            quantity=self.quantity,
-            shipping=self.shipping,
-            categories=self.categories,
-            specs=self.specs,
-        )
-
-    def to_dict(self) -> dict:
-        """
-        Returns a dictionary representation of the MerchantProduct.
-        ShippingCost class is not serializable, so we need to convert it to a dictionary.
-
-        Returns:
-            dict: dictionary representation of the MerchantProduct
-        """
-        shipping_dicts = []
-        for shipping in self.shipping:
-            shipping_dicts.append({"id": shipping.id, "cost": shipping.cost})
-
-        return {
-            "id": self.id,
-            "stall_id": self.stall_id,
-            "name": self.name,
-            "description": self.description,
-            "images": self.images,
-            "currency": self.currency,
-            "price": self.price,
-            "quantity": self.quantity,
-            "shipping": shipping_dicts,
-            "categories": self.categories,
-            "specs": self.specs,
-        }
-
-
-class MerchantStall(BaseModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True)
-
-    id: str
-    name: str
-    description: str
-    currency: str
-    shipping: List[ShippingMethod]
-
-    @classmethod
-    def from_stall_data(cls, stall: StallData) -> "MerchantStall":
-        return cls(
-            id=stall.id(),
-            name=stall.name(),
-            description=stall.description(),
-            currency=stall.currency(),
-            shipping=stall.shipping(),
-        )
-
-    def to_stall_data(self) -> StallData:
-        return StallData(
-            self.id,
-            self.name,
-            self.description,
-            self.currency,
-            self.shipping,  # No conversion needed
-        )
 
-    def to_dict(self) -> dict:
-        """
-        Returns a dictionary representation of the MerchantStall.
-        ShippingMethod class is not serializable, so we need to convert it to a dictionary.
-        We can only access cost and id from the ShippingMethod class. We can't access name or regions.
-
-        Returns:
-            dict: dictionary representation of the MerchantStall
-        """
-        shipping_dicts = []
-        for shipping in self.shipping:
-            shipping_dicts.append(
-                {
-                    "cost": shipping.get_shipping_cost().cost,
-                    "id": shipping.get_shipping_cost().id,
-                }
-            )
-
-        return {
-            "id": self.id,
-            "name": self.name,
-            "description": self.description,
-            "currency": self.currency,
-            "shipping zones": [shipping_dicts],
-        }
-
-
-class Merchant(Toolkit):
+class MerchantTools(Toolkit):
     """
-    Merchant is a toolkit that allows a merchant to publish products and stalls to Nostr.
+    MerchantTools is a toolkit that allows a merchant to publish products and stalls to Nostr.
 
     TBD:
     - Better differentiation between products and stalls in the database and products and stalls published.
@@ -301,7 +35,7 @@ class Merchant(Toolkit):
 
     def __init__(
         self,
-        merchant_profile: Profile,
+        merchant_profile: AgentProfile,
         relay: str,
         stalls: List[MerchantStall],
         products: List[MerchantProduct],
@@ -317,9 +51,7 @@ class Merchant(Toolkit):
         super().__init__(name="merchant")
         self.relay = relay
         self.merchant_profile = merchant_profile
-        self._nostr_client = NostrClient(
-            self.relay, self.merchant_profile.get_private_key()
-        )
+        self._nostr_client = NostrClient(relay, merchant_profile.get_private_key())
 
         # initialize the Product DB with no event id
         self.product_db = [(product, None) for product in products]
@@ -327,7 +59,7 @@ class Merchant(Toolkit):
         # initialize the Stall DB with no event id
         self.stall_db = [(stall, None) for stall in stalls]
 
-        # Register wrapped versions of the methods
+        # Register methods
         self.register(self.get_profile)
         self.register(self.get_relay)
         self.register(self.get_products)
@@ -347,19 +79,25 @@ class Merchant(Toolkit):
 
     def get_profile(self) -> str:
         """
-        Retrieves merchant profile in JSON format
+        Get the merchant profile in JSON format
 
         Returns:
             str: merchant profile in JSON format
         """
-        return json.dumps(self.merchant_profile.to_dict())
+        return json.dumps(self.merchant_profile.to_json())
 
     def get_relay(self) -> str:
+        """
+        Get the Nostr relay the merchant is using
+
+        Returns:
+            str: Nostr relay
+        """
         return self.relay
 
     def get_products(self) -> str:
         """
-        Retrieves all the merchant products
+        Get all the merchant products
 
         Returns:
             str: JSON string containing all products
@@ -368,7 +106,7 @@ class Merchant(Toolkit):
 
     def get_stalls(self) -> str:
         """
-        Retrieves all the merchant stalls in JSON format
+        Get all the merchant stalls in JSON format
 
         Returns:
             str: JSON string containing all stalls
@@ -379,10 +117,13 @@ class Merchant(Toolkit):
         self,
     ) -> str:
         """
-        Publishes or updates all products in the Merchant's Product DB
+        Publishes or updates to Nostrall products in the Merchant's Product DB
 
         Returns:
             str: JSON array with status of all product publishing operations
+
+        Raises:
+            ValueError: if NostrClient is not initialized
         """
 
         if self._nostr_client is None:
@@ -393,9 +134,9 @@ class Merchant(Toolkit):
         for i, (product, _) in enumerate(self.product_db):
             try:
                 # Convert MerchantProduct to ProductData for nostr_client
-                product_data = product.to_product_data()
+                # product_data = product.to_product_data()
                 # Publish using the SDK's synchronous method
-                event_id = self._nostr_client.publish_product(product_data)
+                event_id = self._nostr_client.publish_product(product)
                 self.product_db[i] = (product, event_id)
                 results.append(
                     {
@@ -404,8 +145,10 @@ class Merchant(Toolkit):
                         "product_name": product.name,
                     }
                 )
+                # Pause for 0.5 seconds to avoid rate limiting
+                time.sleep(0.5)
             except Exception as e:
-                Profile.logger.error(f"Unable to publish product {product}. Error {e}")
+                logging.error(f"Unable to publish product {product}. Error {e}")
                 results.append(
                     {"status": "error", "message": str(e), "product_name": product.name}
                 )
@@ -416,10 +159,13 @@ class Merchant(Toolkit):
         self,
     ) -> str:
         """
-        Publishes or updates all stalls managed by the merchant and adds the corresponding EventId to the Stall DB
+        Publishes or updates to Nostr all stalls managed by the merchant and adds the corresponding EventId to the Stall DB
 
         Returns:
             str: JSON array with status of all stall publishing operations
+
+        Raises:
+            ValueError: if NostrClient is not initialized
         """
         if self._nostr_client is None:
             raise ValueError("NostrClient not initialized")
@@ -427,9 +173,9 @@ class Merchant(Toolkit):
 
         for i, (stall, _) in enumerate(self.stall_db):
             try:
-                # Convert MerchantStall to StallData for nostr_client
-                stall_data = stall.to_stall_data()
-                event_id = self._nostr_client.publish_stall(stall_data)
+                # We don't need to convert MerchantStall to StallData for nostr_client
+                # stall_data = stall.to_stall_data()
+                event_id = self._nostr_client.publish_stall(stall)
                 self.stall_db[i] = (stall, event_id)
                 results.append(
                     {
@@ -438,8 +184,10 @@ class Merchant(Toolkit):
                         "stall_name": stall.name,
                     }
                 )
+                # Pause for 0.5 seconds to avoid rate limiting
+                time.sleep(0.5)
             except Exception as e:
-                Profile.logger.error(f"Unable to publish stall {stall}. Error {e}")
+                logging.error(f"Unable to publish stall {stall}. Error {e}")
                 results.append(
                     {"status": "error", "message": str(e), "stall_name": stall.name}
                 )
@@ -448,13 +196,16 @@ class Merchant(Toolkit):
 
     def publish_new_product(self, product: MerchantProduct) -> str:
         """
-        Publishes a new product that is not currently in the Merchant's Product DB and adds it to the Product DB
+        Publishes to Nostra new product that is not currently in the Merchant's Product DB and adds it to the Product DB
 
         Args:
             product: MerchantProduct to be published
 
         Returns:
             str: JSON string with status of the operation
+
+        Raises:
+            ValueError: if NostrClient is not initialized
         """
         if self._nostr_client is None:
             raise ValueError("NostrClient not initialized")
@@ -480,12 +231,15 @@ class Merchant(Toolkit):
 
     def publish_product_by_name(self, arguments: str) -> str:
         """
-        Publishes or updates a given product from the Merchant's Product DB
+        Publishes or updates to Nostra given product from the Merchant's Product DB
         Args:
             arguments: JSON string that may contain {"name": "product_name"} or just "product_name"
 
         Returns:
             str: JSON string with status of the operation
+
+        Raises:
+            ValueError: if NostrClient is not initialized
         """
         if self._nostr_client is None:
             raise ValueError("NostrClient not initialized")
@@ -508,9 +262,9 @@ class Merchant(Toolkit):
             if product.name == name:
                 try:
                     # Convert MerchantProduct to ProductData for nostr_client
-                    product_data = product.to_product_data()
+                    # product_data = product.to_product_data()
                     # Publish using the SDK's synchronous method
-                    event_id = self._nostr_client.publish_product(product_data)
+                    event_id = self._nostr_client.publish_product(product)
                     # Update the product_db with the new event_id
                     self.product_db[i] = (product, event_id)
                     return json.dumps(
@@ -520,6 +274,8 @@ class Merchant(Toolkit):
                             "product_name": product.name,
                         }
                     )
+                    # Pause for 0.5 seconds to avoid rate limiting
+                    time.sleep(0.5)
                 except Exception as e:
                     return json.dumps(
                         {
@@ -540,7 +296,7 @@ class Merchant(Toolkit):
 
     def publish_products_by_stall_name(self, arguments: Union[str, dict]) -> str:
         """
-        Publishes or updates all products sold by the merchant in a given stall
+        Publishes or updates to Nostr all products sold by the merchant in a given stall
 
         Args:
             arguments: str or dict with the stall name. Can be in formats:
@@ -550,6 +306,9 @@ class Merchant(Toolkit):
 
         Returns:
             str: JSON array with status of all product publishing operations
+
+        Raises:
+            ValueError: if NostrClient is not initialized
         """
         if self._nostr_client is None:
             raise ValueError("NostrClient not initialized")
@@ -604,8 +363,8 @@ class Merchant(Toolkit):
             for i, (product, _) in enumerate(self.product_db):
                 if product.stall_id == stall_id:
                     try:
-                        product_data = product.to_product_data()
-                        event_id = self._nostr_client.publish_product(product_data)
+                        # product_data = product.to_product_data()
+                        event_id = self._nostr_client.publish_product(product)
                         self.product_db[i] = (product, event_id)
                         results.append(
                             {
@@ -615,6 +374,8 @@ class Merchant(Toolkit):
                                 "stall_name": stall_name,
                             }
                         )
+                        # Pause for 0.5 seconds to avoid rate limiting
+                        time.sleep(0.5)
                     except Exception as e:
                         results.append(
                             {
@@ -645,7 +406,7 @@ class Merchant(Toolkit):
 
     def publish_profile(self) -> str:
         """
-        Publishes the profile on Nostr
+        Publishes the profile to Nostr
 
         Returns:
             str: JSON of the event that published the profile
@@ -668,22 +429,25 @@ class Merchant(Toolkit):
 
     def publish_new_stall(self, stall: MerchantStall) -> str:
         """
-        Publishes a new stall that is not currently in the Merchant's Stall DB and adds it to the Stall DB
+        Publishes to Nostr a new stall that is not currently in the Merchant's Stall DB and adds it to the Stall DB
 
         Args:
             stall: MerchantStall to be published
 
         Returns:
             str: JSON string with status of the operation
+
+        Raises:
+            ValueError: if NostrClient is not initialized
         """
         if self._nostr_client is None:
             raise ValueError("NostrClient not initialized")
 
         try:
-            # Convert to StallData for SDK
-            stall_data = stall.to_stall_data()
-            # Publish using the SDK's synchronous method
-            event_id = self._nostr_client.publish_stall(stall_data)
+            # We don't ned to convert to StallData. nostr_client.publish_stall() accepts a MerchantStall
+            # stall_data = stall.to_stall_data()
+            # Publish using the  synchronous method
+            event_id = self._nostr_client.publish_stall(stall)
             # we need to add the stall event id to the stall db
             self.stall_db.append((stall, event_id))
             return json.dumps(
@@ -699,6 +463,21 @@ class Merchant(Toolkit):
             )
 
     def publish_stall_by_name(self, arguments: Union[str, dict]) -> str:
+        """
+        Publishes or updates to Nostr a given stall by name
+
+        Args:
+            arguments: str or dict with the stall name. Can be in formats:
+                - {"name": "stall_name"}
+                - {"arguments": "{\"name\": \"stall_name\"}"}
+                - "stall_name"
+
+        Returns:
+            str: JSON array with status of the operation
+
+        Raises:
+            ValueError: if NostrClient is not initialized
+        """
         if self._nostr_client is None:
             raise ValueError("NostrClient not initialized")
 
@@ -735,8 +514,9 @@ class Merchant(Toolkit):
             for i, (stall, _) in enumerate(self.stall_db):
                 if stall.name == stall_name:
                     try:
-                        stall_data = stall.to_stall_data()
-                        event_id = self._nostr_client.publish_stall(stall_data)
+                        # We are not passing StallData to nostr_client.publish_stall() anymore
+                        # stall_data = stall.to_stall_data()
+                        event_id = self._nostr_client.publish_stall(stall)
                         self.stall_db[i] = (stall, event_id)
                         return json.dumps(
                             {
@@ -745,6 +525,8 @@ class Merchant(Toolkit):
                                 "stall_name": stall.name,
                             }
                         )
+                        # Pause for 0.5 seconds to avoid rate limiting
+                        time.sleep(0.5)
                     except Exception as e:
                         return json.dumps(
                             [
@@ -774,10 +556,13 @@ class Merchant(Toolkit):
 
     def remove_all_products(self) -> str:
         """
-        Removes all published products from Nostr
+        Removes from Nostr all products published by the merchant
 
         Returns:
             str: JSON array with status of all product removal operations
+
+        Raises:
+            ValueError: if NostrClient is not initialized
         """
         if self._nostr_client is None:
             raise ValueError("NostrClient not initialized")
@@ -810,6 +595,8 @@ class Merchant(Toolkit):
                         "event_id": str(event_id),
                     }
                 )
+                # Pause for 0.5 seconds to avoid rate limiting
+                time.sleep(0.5)
             except Exception as e:
                 results.append(
                     {"status": "error", "message": str(e), "product_name": product.name}
@@ -819,10 +606,13 @@ class Merchant(Toolkit):
 
     def remove_all_stalls(self) -> str:
         """
-        Removes all stalls and their products from Nostr
+        Removes from Nostr all stalls from the merchant and their corresponding products
 
         Returns:
             str: JSON array with status of all removal operations
+
+        Raises:
+            ValueError: if NostrClient is not initialized
         """
         if self._nostr_client is None:
             raise ValueError("NostrClient not initialized")
@@ -897,6 +687,8 @@ class Merchant(Toolkit):
                             "event_id": str(stall_event_id),
                         }
                     )
+                    # Pause for 0.5 seconds to avoid rate limiting
+                    time.sleep(0.5)
                 except Exception as e:
                     results.append(
                         {"status": "error", "message": str(e), "stall_name": stall_name}
@@ -906,13 +698,16 @@ class Merchant(Toolkit):
 
     def remove_product_by_name(self, arguments: str) -> str:
         """
-        Deletes a product with the given name from Nostr
+        Removes from Nostr a product with the given name
 
         Args:
             arguments: JSON string that may contain {"name": "product_name"} or just "product_name"
 
         Returns:
             str: JSON string with status of the operation
+
+        Raises:
+            ValueError: if NostrClient is not initialized
         """
         if self._nostr_client is None:
             raise ValueError("NostrClient not initialized")
@@ -949,6 +744,8 @@ class Merchant(Toolkit):
                     )
                     # Remove the event_id, keeping the product in the database
                     self.product_db[i] = (product, None)
+                    # Pause for 0.5 seconds to avoid rate limiting
+                    time.sleep(0.5)
                     return json.dumps(
                         {
                             "status": "success",
@@ -972,7 +769,8 @@ class Merchant(Toolkit):
         )
 
     def remove_stall_by_name(self, arguments: Union[str, dict]) -> str:
-        """Remove a stall and its products by name
+        """
+        Remove from Nostr a stall and its products by name
 
         Args:
             arguments: str or dict with the stall name. Can be in formats:
@@ -982,6 +780,9 @@ class Merchant(Toolkit):
 
         Returns:
             str: JSON array with status of the operation
+
+        Raises:
+            ValueError: if NostrClient is not initialized
         """
         if self._nostr_client is None:
             raise ValueError("NostrClient not initialized")
@@ -1063,6 +864,8 @@ class Merchant(Toolkit):
                                 "event_id": str(event_id),
                             }
                         )
+                        # Pause for 0.5 seconds to avoid rate limiting
+                        time.sleep(0.5)
                     except Exception as e:
                         results.append(
                             {
@@ -1117,15 +920,15 @@ class Merchant(Toolkit):
                 [{"status": "error", "message": str(e), "stall_name": "unknown"}]
             )
 
-    def get_event_id(self, response: Any) -> str:
-        """Convert any response to a string event ID.
+    # def get_event_id(self, response: Any) -> str:
+    #     """Convert any response to a string event ID.
 
-        Args:
-            response: Response that might contain an event ID
+    #     Args:
+    #         response: Response that might contain an event ID
 
-        Returns:
-            str: String representation of event ID or empty string if None
-        """
-        if response is None:
-            return ""
-        return str(response)
+    #     Returns:
+    #         str: String representation of event ID or empty string if None
+    #     """
+    #     if response is None:
+    #         return ""
+    #     return str(response)