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

agentstr/__init__.py

@@ -2,8 +2,14 @@
 AgentStr: Nostr extension for Agno AI agents
 """
 
-from nostr_sdk import ShippingCost, ShippingMethod  # type: ignore
+import importlib.metadata
+import logging
 
+from nostr_sdk import ShippingCost, ShippingMethod, Timestamp  # type: ignore
+
+from agentstr.nostr import EventId, Keys, Kind, NostrClient, generate_and_save_keys
+
+from .buyer import BuyerTools
 from .merchant import MerchantTools
 
 # Import main classes to make them available at package level
@@ -11,27 +17,33 @@ from .models import AgentProfile, MerchantProduct, MerchantStall, NostrProfile
 
 # Import version from pyproject.toml at runtime
 try:
-    from importlib.metadata import version
-
-    __version__ = version("agentstr")
-except Exception:
+    __version__ = importlib.metadata.version("agentstr")
+except importlib.metadata.PackageNotFoundError:
+    logging.warning("Package 'agentstr' not found. Falling back to 'unknown'.")
+    __version__ = "unknown"
+except ImportError:
+    logging.warning("importlib.metadata is not available. Falling back to 'unknown'.")
     __version__ = "unknown"
 
+# Define What is Exposed at the Package Level
 __all__ = [
+    # Merchant Tools
     "MerchantTools",
     "MerchantProduct",
     "MerchantStall",
+    # Buyer Tools
+    "BuyerTools",
+    # Shipping
     "ShippingCost",
     "ShippingMethod",
-]
-
-from agentstr.nostr import EventId, Keys, NostrClient, ProductData, StallData
-
-__all__ = [
+    # Nostr-related utils
     "EventId",
     "Keys",
+    "Kind",
     "NostrClient",
-    "ProductData",
-    "StallData",
+    "generate_and_save_keys",
+    "Timestamp",
+    # Models
     "AgentProfile",
+    "NostrProfile",
 ]

agentstr/buyer.py

@@ -1,17 +1,24 @@
+"""
+Module implementing the BuyerTools Toolkit for Agno agents.
+"""
+
 import json
 import logging
 from uuid import uuid4
 
-from agno.agent import AgentKnowledge  # type: ignore
-from agno.document.base import Document
+from pydantic import ConfigDict
 
 from agentstr.models import AgentProfile, NostrProfile
 from agentstr.nostr import NostrClient, PublicKey
 
 try:
+    from agno.agent import AgentKnowledge  # type: ignore
+    from agno.document.base import Document
     from agno.tools import Toolkit
-except ImportError:
-    raise ImportError("`agno` not installed. Please install using `pip install agno`")
+except ImportError as exc:
+    raise ImportError(
+        "`agno` not installed. Please install using `pip install agno`"
+    ) from exc
 
 
 def _map_location_to_geohash(location: str) -> str:
@@ -21,20 +28,22 @@ def _map_location_to_geohash(location: str) -> str:
     TBD: Implement this function. Returning a fixed geohash for now.
 
     Args:
-        location: location to map to a geohash. Can be a zip code, city, state, country, or latitude and longitude.
+        location: location to map to a geohash. Can be a zip code, city,
+        state, country, or latitude and longitude.
 
     Returns:
         str: geohash of the location or empty string if location is not found
     """
     if "snoqualmie" in location.lower():
         return "C23Q7U36W"
-    else:
-        return ""
+
+    return ""
 
 
 class BuyerTools(Toolkit):
     """
-    BuyerTools is a toolkit that allows an agent to find sellers and transact with them over Nostr.
+    BuyerTools is a toolkit that allows an agent to find sellers and
+    transact with them over Nostr.
 
     Sellers are downloaded from the Nostr relay and cached.
     Sellers can be found by name or public key.
@@ -44,8 +53,6 @@ class BuyerTools(Toolkit):
     TBD: populate the sellers locations with info from stalls.
     """
 
-    from pydantic import ConfigDict
-
     model_config = ConfigDict(
         arbitrary_types_allowed=True, extra="allow", validate_assignment=True
     )
@@ -92,8 +99,13 @@ class BuyerTools(Toolkit):
 
         Args:
             product: JSON string with product to purchase
+
+        Returns:
+            str: JSON string with status and message
         """
-        return json.dumps({"status": "success", "message": "Product purchased"})
+        return json.dumps(
+            {"status": "success", "message": f"Product {product} purchased"}
+        )
 
     def find_seller_by_name(self, name: str) -> str:
         """Find a seller by name.
@@ -151,9 +163,6 @@ class BuyerTools(Toolkit):
         # Find sellers in the same geohash
         for seller in self.sellers:
             if geohash in seller.get_locations():
-                # print(
-                #     f"geohash {geohash} found in seller {seller.get_name()} with locations {seller.get_locations()}"
-                # )
                 sellers.add(seller)
 
         if not sellers:
@@ -165,9 +174,17 @@ class BuyerTools(Toolkit):
         response = json.dumps([seller.to_dict() for seller in sellers])
         # print("find_sellers_by_location: storing response in knowledge base")
         self._store_response_in_knowledge_base(response)
-        # print(f"Found {len(sellers)} sellers near {location}")
+        self.logger.info("Found %d sellers", len(sellers))
         return response
 
+    def get_nostr_client(self) -> NostrClient:
+        """Get the Nostr client.
+
+        Returns:
+            NostrClient: Nostr client
+        """
+        return self._nostr_client
+
     def get_profile(self) -> str:
         """Get the Nostr profile of the buyer agent.
 
@@ -204,7 +221,7 @@ class BuyerTools(Toolkit):
             response = json.dumps([stall.as_json() for stall in stalls])
             self._store_response_in_knowledge_base(response)
             return response
-        except Exception as e:
+        except RuntimeError as e:
             response = json.dumps({"status": "error", "message": str(e)})
             return response
 
@@ -234,7 +251,7 @@ class BuyerTools(Toolkit):
             response = json.dumps([product.to_dict() for product in products])
             self._store_response_in_knowledge_base(response)
             return response
-        except Exception as e:
+        except RuntimeError as e:
             response = json.dumps({"status": "error", "message": str(e)})
             return response
 
@@ -265,7 +282,8 @@ class BuyerTools(Toolkit):
     def _refresh_sellers(self) -> None:
         """
         Internal fucntion to retrieve a new list of sellers from the Nostr relay.
-        The old list is discarded and the new list only contains unique sellers currently stored at the relay.
+        The old list is discarded and the new list only contains unique sellers
+        currently stored at the relay.
 
         Returns:
             List[NostrProfile]: List of Nostr profiles of all sellers.
@@ -274,11 +292,7 @@ class BuyerTools(Toolkit):
         if len(sellers) == 0:
             self.logger.info("No sellers found")
         else:
-            self.logger.info(f"Found {len(sellers)} sellers")
-
-        # Print the locations of the sellers
-        # for seller in sellers:
-        #     print(f"Seller {seller.get_name()} has locations {seller.get_locations()}")
+            self.logger.info("Found %d sellers", len(sellers))
 
         self.sellers = sellers
 

agentstr/buyer.pyi

@@ -19,6 +19,7 @@ class BuyerTools(Toolkit):
     def find_seller_by_name(self, name: str) -> str: ...
     def find_seller_by_public_key(self, public_key: str) -> str: ...
     def find_sellers_by_location(self, location: str) -> str: ...
+    def get_nostr_client(self) -> NostrClient: ...
     def get_profile(self) -> str: ...
     def get_relay(self) -> str: ...
     def get_seller_stalls(self, public_key: str) -> str: ...

agentstr/merchant.py

@@ -1,30 +1,36 @@
+"""
+Module implementing the MerchantTools Toolkit for Agno agents.
+"""
+
 import json
 import logging
 import time
 from typing import Any, List, Optional, Tuple, Union
 
+from pydantic import ConfigDict
+
 from agentstr.models import AgentProfile, MerchantProduct, MerchantStall
 from agentstr.nostr import EventId, NostrClient
 
 try:
     from agno.tools import Toolkit
-except ImportError:
-    raise ImportError("`agno` not installed. Please install using `pip install agno`")
-
-from pydantic import BaseModel, ConfigDict
+except ImportError as exc:
+    raise ImportError(
+        "`agno` not installed. Please install using `pip install agno`"
+    ) from exc
 
 
 class MerchantTools(Toolkit):
     """
-    MerchantTools 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.
+    - Better differentiation between products and stalls in the database
+    and products and stalls published.
 
     """
 
-    from pydantic import ConfigDict
-
     model_config = ConfigDict(
         arbitrary_types_allowed=True, extra="allow", validate_assignment=True
     )
@@ -77,6 +83,12 @@ class MerchantTools(Toolkit):
         self.register(self.remove_product_by_name)
         self.register(self.remove_stall_by_name)
 
+    def get_nostr_client(self) -> NostrClient:
+        """
+        Get the NostrClient instance
+        """
+        return self._nostr_client
+
     def get_profile(self) -> str:
         """
         Get the merchant profile in JSON format
@@ -147,8 +159,8 @@ class MerchantTools(Toolkit):
                 )
                 # Pause for 0.5 seconds to avoid rate limiting
                 time.sleep(0.5)
-            except Exception as e:
-                logging.error(f"Unable to publish product {product}. Error {e}")
+            except RuntimeError as e:
+                logging.error("Unable to publish product %s. Error %s", product, e)
                 results.append(
                     {"status": "error", "message": str(e), "product_name": product.name}
                 )
@@ -159,7 +171,8 @@ class MerchantTools(Toolkit):
         self,
     ) -> str:
         """
-        Publishes or updates to Nostr 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
@@ -186,8 +199,8 @@ class MerchantTools(Toolkit):
                 )
                 # Pause for 0.5 seconds to avoid rate limiting
                 time.sleep(0.5)
-            except Exception as e:
-                logging.error(f"Unable to publish stall {stall}. Error {e}")
+            except RuntimeError as e:
+                logging.error("Unable to publish stall %s. Error %s", stall, e)
                 results.append(
                     {"status": "error", "message": str(e), "stall_name": stall.name}
                 )
@@ -196,7 +209,8 @@ class MerchantTools(Toolkit):
 
     def publish_new_product(self, product: MerchantProduct) -> str:
         """
-        Publishes to Nostra 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
@@ -224,7 +238,7 @@ class MerchantTools(Toolkit):
                     "product_name": product.name,
                 }
             )
-        except Exception as e:
+        except RuntimeError as e:
             return json.dumps(
                 {"status": "error", "message": str(e), "product_name": product.name}
             )
@@ -233,7 +247,8 @@ class MerchantTools(Toolkit):
         """
         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"
+            arguments: JSON string that may contain
+            {"name": "product_name"} or just "product_name"
 
         Returns:
             str: JSON string with status of the operation
@@ -267,6 +282,8 @@ class MerchantTools(Toolkit):
                     event_id = self._nostr_client.publish_product(product)
                     # Update the product_db with the new event_id
                     self.product_db[i] = (product, event_id)
+                    # Pause for 0.5 seconds to avoid rate limiting
+                    time.sleep(0.5)
                     return json.dumps(
                         {
                             "status": "success",
@@ -274,9 +291,7 @@ class MerchantTools(Toolkit):
                             "product_name": product.name,
                         }
                     )
-                    # Pause for 0.5 seconds to avoid rate limiting
-                    time.sleep(0.5)
-                except Exception as e:
+                except RuntimeError as e:
                     return json.dumps(
                         {
                             "status": "error",
@@ -376,7 +391,7 @@ class MerchantTools(Toolkit):
                         )
                         # Pause for 0.5 seconds to avoid rate limiting
                         time.sleep(0.5)
-                    except Exception as e:
+                    except RuntimeError as e:
                         results.append(
                             {
                                 "status": "error",
@@ -399,7 +414,7 @@ class MerchantTools(Toolkit):
 
             return json.dumps(results)
 
-        except Exception as e:
+        except RuntimeError as e:
             return json.dumps(
                 [{"status": "error", "message": str(e), "arguments": str(arguments)}]
             )
@@ -424,12 +439,13 @@ class MerchantTools(Toolkit):
                 self.merchant_profile.get_picture(),
             )
             return json.dumps(event_id.__dict__)
-        except Exception as e:
-            raise RuntimeError(f"Unable to publish the profile: {e}")
+        except RuntimeError as e:
+            raise RuntimeError(f"Unable to publish the profile: {e}") from e
 
     def publish_new_stall(self, stall: MerchantStall) -> str:
         """
-        Publishes to Nostr 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
@@ -444,7 +460,8 @@ class MerchantTools(Toolkit):
             raise ValueError("NostrClient not initialized")
 
         try:
-            # We don't ned to convert to StallData. nostr_client.publish_stall() accepts a MerchantStall
+            # 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)
@@ -457,7 +474,7 @@ class MerchantTools(Toolkit):
                     "stall_name": stall.name,
                 }
             )
-        except Exception as e:
+        except RuntimeError as e:
             return json.dumps(
                 {"status": "error", "message": str(e), "stall_name": stall.name}
             )
@@ -514,10 +531,10 @@ class MerchantTools(Toolkit):
             for i, (stall, _) in enumerate(self.stall_db):
                 if stall.name == stall_name:
                     try:
-                        # 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)
+                        # Pause for 0.5 seconds to avoid rate limiting
+                        time.sleep(0.5)
                         return json.dumps(
                             {
                                 "status": "success",
@@ -525,9 +542,8 @@ class MerchantTools(Toolkit):
                                 "stall_name": stall.name,
                             }
                         )
-                        # Pause for 0.5 seconds to avoid rate limiting
-                        time.sleep(0.5)
-                    except Exception as e:
+
+                    except RuntimeError as e:
                         return json.dumps(
                             [
                                 {
@@ -549,7 +565,7 @@ class MerchantTools(Toolkit):
                 ]
             )
 
-        except Exception as e:
+        except RuntimeError as e:
             return json.dumps(
                 [{"status": "error", "message": str(e), "stall_name": "unknown"}]
             )
@@ -574,7 +590,9 @@ class MerchantTools(Toolkit):
                 results.append(
                     {
                         "status": "skipped",
-                        "message": f"Product '{product.name}' has not been published yet",
+                        "message": (
+                            f"Product '{product.name}' has not been published yet"
+                        ),
                         "product_name": product.name,
                     }
                 )
@@ -597,7 +615,7 @@ class MerchantTools(Toolkit):
                 )
                 # Pause for 0.5 seconds to avoid rate limiting
                 time.sleep(0.5)
-            except Exception as e:
+            except RuntimeError as e:
                 results.append(
                     {"status": "error", "message": str(e), "product_name": product.name}
                 )
@@ -606,7 +624,8 @@ class MerchantTools(Toolkit):
 
     def remove_all_stalls(self) -> str:
         """
-        Removes from Nostr all stalls from the merchant and their corresponding products
+        Removes from Nostr all stalls from the merchant and their
+        corresponding products
 
         Returns:
             str: JSON array with status of all removal operations
@@ -631,7 +650,7 @@ class MerchantTools(Toolkit):
                         results.append(
                             {
                                 "status": "skipped",
-                                "message": f"Product '{product.name}' has not been published yet",
+                                "message": "Unpublished product",
                                 "product_name": product.name,
                                 "stall_name": stall_name,
                             }
@@ -653,7 +672,7 @@ class MerchantTools(Toolkit):
                                 "event_id": str(event_id),
                             }
                         )
-                    except Exception as e:
+                    except RuntimeError as e:
                         results.append(
                             {
                                 "status": "error",
@@ -669,7 +688,7 @@ class MerchantTools(Toolkit):
                 results.append(
                     {
                         "status": "skipped",
-                        "message": f"Stall '{stall_name}' has not been published yet",
+                        "message": (f"Stall '{stall_name}' has not been published yet"),
                         "stall_name": stall_name,
                     }
                 )
@@ -689,7 +708,7 @@ class MerchantTools(Toolkit):
                     )
                     # Pause for 0.5 seconds to avoid rate limiting
                     time.sleep(0.5)
-                except Exception as e:
+                except RuntimeError as e:
                     results.append(
                         {"status": "error", "message": str(e), "stall_name": stall_name}
                     )
@@ -701,7 +720,8 @@ class MerchantTools(Toolkit):
         Removes from Nostr a product with the given name
 
         Args:
-            arguments: JSON string that may contain {"name": "product_name"} or just "product_name"
+            arguments: JSON string that may contain {"name": "product_name"}
+            or just "product_name"
 
         Returns:
             str: JSON string with status of the operation
@@ -754,7 +774,7 @@ class MerchantTools(Toolkit):
                             "event_id": str(event_id),
                         }
                     )
-                except Exception as e:
+                except RuntimeError as e:
                     return json.dumps(
                         {"status": "error", "message": str(e), "product_name": name}
                     )
@@ -843,7 +863,7 @@ class MerchantTools(Toolkit):
                         results.append(
                             {
                                 "status": "skipped",
-                                "message": f"Product '{product.name}' has not been published yet",
+                                "message": "Unpublished product",
                                 "product_name": product.name,
                                 "stall_name": stall_name,
                             }
@@ -866,7 +886,7 @@ class MerchantTools(Toolkit):
                         )
                         # Pause for 0.5 seconds to avoid rate limiting
                         time.sleep(0.5)
-                    except Exception as e:
+                    except RuntimeError as e:
                         results.append(
                             {
                                 "status": "error",
@@ -883,7 +903,9 @@ class MerchantTools(Toolkit):
                     results.append(
                         {
                             "status": "skipped",
-                            "message": f"Stall '{stall_name}' has not been published yet",
+                            "message": (
+                                f"Stall '{stall_name}' has not been published yet"
+                            ),
                             "stall_name": stall_name,
                         }
                     )
@@ -904,7 +926,7 @@ class MerchantTools(Toolkit):
                                 "event_id": str(stall_event_id),
                             }
                         )
-                    except Exception as e:
+                    except RuntimeError as e:
                         results.append(
                             {
                                 "status": "error",
@@ -915,20 +937,7 @@ class MerchantTools(Toolkit):
 
             return json.dumps(results)
 
-        except Exception as e:
+        except RuntimeError as e:
             return json.dumps(
                 [{"status": "error", "message": str(e), "stall_name": "unknown"}]
             )
-
-    # 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
-
-    #     Returns:
-    #         str: String representation of event ID or empty string if None
-    #     """
-    #     if response is None:
-    #         return ""
-    #     return str(response)

agentstr/merchant.pyi

@@ -18,6 +18,7 @@ class MerchantTools(Toolkit):
         stalls: List[MerchantStall],
         products: List[MerchantProduct],
     ) -> None: ...
+    def get_nostr_client(self) -> NostrClient: ...
     def get_profile(self) -> str: ...
     def get_relay(self) -> str: ...
     def get_products(self) -> str: ...
@@ -34,4 +35,3 @@ class MerchantTools(Toolkit):
     def remove_all_stalls(self) -> str: ...
     def remove_product_by_name(self, product_name: str) -> str: ...
     def remove_stall_by_name(self, stall_name: str) -> str: ...
-    def get_event_id(self, response: Any) -> str: ...

agentstr/models.py

@@ -1,6 +1,6 @@
 import json
 import logging
-from typing import List, Optional
+from typing import List
 
 from nostr_sdk import (
     Keys,
@@ -131,9 +131,6 @@ class NostrProfile(Profile):
     def get_profile_url(self) -> str:
         return self.profile_url
 
-    def get_zip_codes(self) -> List[str]:
-        return self.zip_codes
-
     def to_json(self) -> str:
         # Ensure super().to_json() returns a dictionary
         parent_json = super().to_json()
@@ -287,14 +284,15 @@ class MerchantProduct(BaseModel):
                 specs=self.specs,
             )
         except Exception as e:
-            logging.error(f"Failed to convert to ProductData: {e}")
-            logging.error(f"Shipping data: {self.shipping}")
+            logging.error("Failed to convert to ProductData: %s", e)
+            logging.error("Shipping data: %s", self.shipping)
             raise
 
     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.
+        ShippingCost class is not serializable, so we need to convert it
+        to a dictionary.
 
         Returns:
             dict: dictionary representation of the MerchantProduct
@@ -347,8 +345,9 @@ class MerchantStall(BaseModel):
     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.
+        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

agentstr/models.pyi

@@ -1,5 +1,5 @@
 from logging import Logger
-from typing import ClassVar, List, Optional, Set
+from typing import ClassVar, List, Set
 
 from nostr_sdk import (
     Keys,

agentstr/nostr.py

@@ -1,19 +1,16 @@
+"""
+Core Nostr utilities for agentstr.
+"""
+
+import asyncio
 import json
 import logging
-import traceback
 from datetime import timedelta
 from pathlib import Path
-from typing import Dict, List, Optional, Tuple
+from typing import Dict, List, Optional
 
 from agentstr.models import MerchantProduct, MerchantStall, NostrProfile
 
-try:
-    import asyncio
-except ImportError:
-    raise ImportError(
-        "`asyncio` not installed. Please install using `pip install asyncio`"
-    )
-
 try:
     from nostr_sdk import (
         Alphabet,
@@ -29,29 +26,26 @@ try:
         NostrSigner,
         ProductData,
         PublicKey,
-        ShippingCost,
-        ShippingMethod,
         SingleLetterTag,
         StallData,
         Tag,
         TagKind,
         TagStandard,
-        Timestamp,
     )
-
-except ImportError:
+except ImportError as exc:
     raise ImportError(
         "`nostr_sdk` not installed. Please install using `pip install nostr_sdk`"
-    )
+    ) from exc
 
 
 class NostrClient:
     """
-    NostrClient implements the set of Nostr utilities required for higher level functions implementing
-    like the Marketplace.
+    NostrClient implements the set of Nostr utilities required for
+    higher level functions implementations like the Marketplace.
 
-    Nostr is an asynchronous communication protocol. To hide this, NostrClient exposes synchronous functions.
-    Users of the NostrClient should ignore `_async_` functions which are for internal purposes only.
+    Nostr is an asynchronous communication protocol. To hide this,
+    NostrClient exposes synchronous functions. Users of the NostrClient
+    should ignore `_async_` functions which are for internal purposes only.
     """
 
     logger = logging.getLogger("NostrClient")
@@ -148,7 +142,7 @@ class NostrClient:
         try:
             return asyncio.run(self._async_publish_product(product))
         except Exception as e:
-            raise RuntimeError(f"Failed to publish product: {e}")
+            raise RuntimeError(f"Failed to publish product: {e}") from e
 
     def publish_profile(self, name: str, about: str, picture: str) -> EventId:
         """
@@ -183,7 +177,7 @@ class NostrClient:
         try:
             return asyncio.run(self._async_publish_stall(stall))
         except Exception as e:
-            raise RuntimeError(f"Failed to publish stall: {e}")
+            raise RuntimeError(f"Failed to publish stall: {e}") from e
 
     def retrieve_products_from_seller(self, seller: PublicKey) -> List[MerchantProduct]:
         """
@@ -217,7 +211,7 @@ class NostrClient:
                 products.append(MerchantProduct.from_product_data(product_data))
             return products
         except Exception as e:
-            raise RuntimeError(f"Failed to retrieve products: {e}")
+            raise RuntimeError(f"Failed to retrieve products: {e}") from e
 
     def retrieve_profile(self, public_key: PublicKey) -> NostrProfile:
         """
@@ -235,7 +229,7 @@ class NostrClient:
         try:
             return asyncio.run(self._async_retrieve_profile(public_key))
         except Exception as e:
-            raise RuntimeError(f"Failed to retrieve profile: {e}")
+            raise RuntimeError(f"Failed to retrieve profile: {e}") from e
 
     def retrieve_sellers(self) -> set[NostrProfile]:
         """
@@ -244,17 +238,18 @@ class NostrClient:
         Return set may be empty if metadata can't be retrieved for any author.
 
         Returns:
-            set[NostrProfile]: set of seller profiles (skips authors with missing metadata)
+            set[NostrProfile]: set of seller profiles
+            (skips authors with missing metadata)
         """
 
-        sellers: set[NostrProfile] = set()
+        # sellers: set[NostrProfile] = set()
 
         # First we retrieve all stalls from the relay
 
         try:
             events = asyncio.run(self._async_retrieve_all_stalls())
         except Exception as e:
-            raise RuntimeError(f"Failed to retrieve stalls: {e}")
+            raise RuntimeError(f"Failed to retrieve stalls: {e}") from e
 
         # Now we search for unique npubs from the list of stalls
 
@@ -265,17 +260,16 @@ class NostrClient:
             if event.kind() == Kind(30017):
                 # Is this event the first time we see this author?
                 if event.author() not in authors:
-                    # First time we see this author. Let's add the profile to the dictionary
+                    # First time we see this author.
+                    # Let's add the profile to the dictionary
                     try:
                         profile = asyncio.run(
                             self._async_retrieve_profile(event.author())
                         )
-                        # Add the profile to the dictionary, associating it with the author's PublicKey
+                        # Add profile to the dictionary
+                        # associated with the author's PublicKey
                         authors[event.author()] = profile
-                    except Exception as e:
-                        # print(
-                        #     f"Failed to retrieve profile for {event.author().to_bech32()}: {e}"
-                        # )
+                    except RuntimeError:
                         continue
 
                 # Now we add locations from the event locations to the profile
@@ -287,15 +281,10 @@ class NostrClient:
                         extracted_geohash = string_repr.split("=")[1].rstrip(
                             ")"
                         )  # Splitting and removing the closing parenthesis
-                        # print(
-                        #     f"Adding location {extracted_geohash} to profile {authors[event.author()].get_name()}"
-                        # )
+
                         profile = authors[event.author()]
                         profile.add_location(extracted_geohash)
                         authors[event.author()] = profile
-                        # print(
-                        #     f"New locations for {authors[event.author()].get_name()}: {authors[event.author()].get_locations()}"
-                        # )
                     # else:
                     #     print(f"Unknown tag: {standardized_tag}")
 
@@ -311,6 +300,9 @@ class NostrClient:
 
         Returns:
             List[StallData]: list of stalls from the seller
+
+        Raises:
+            RuntimeError: if the stalls can't be retrieved
         """
         stalls = []
         try:
@@ -322,12 +314,12 @@ class NostrClient:
                     content = event.content()
                     stall = StallData.from_json(content)
                     stalls.append(stall)
-                except Exception as e:
-                    self.logger.warning(f"Failed to parse stall data: {e}")
+                except RuntimeError as e:
+                    self.logger.warning("Failed to parse stall data: %s", e)
                     continue
             return stalls
         except Exception as e:
-            raise RuntimeError(f"Failed to retrieve stalls: {e}")
+            raise RuntimeError(f"Failed to retrieve stalls: {e}") from e
 
     @classmethod
     def set_logging_level(cls, logging_level: int) -> None:
@@ -339,15 +331,18 @@ class NostrClient:
         cls.logger.setLevel(logging_level)
         for handler in cls.logger.handlers:
             handler.setLevel(logging_level)
-        cls.logger.info(f"Logging level set to {logging.getLevelName(logging_level)}")
+        cls.logger.info("Logging level set to %s", logging.getLevelName(logging_level))
 
-    # ----------------------------------------------------------------------------------------------
-    # --*-- async functions for internal use only. Developers should use synchronous functions above
-    # ----------------------------------------------------------------------------------------------
+    # ----------------------------------------------------------------
+    # internal async functions.
+    # Developers should use synchronous functions above
+    # ----------------------------------------------------------------
 
     async def _async_connect(self) -> None:
-        """Asynchronous function to add relay to the NostrClient instance and connect to it.
-        TBD: refactor to not return anything if successful and raise an exception if not
+        """
+        Asynchronous function to add relay to the NostrClient
+        instance and connect to it.
+
 
         Raises:
             RuntimeError: if the relay can't be connected to
@@ -356,7 +351,7 @@ class NostrClient:
         if not self.connected:
             try:
                 await self.client.add_relay(self.relay)
-                NostrClient.logger.info(f"Relay {self.relay} succesfully added.")
+                NostrClient.logger.info("Relay %s successfully added.", self.relay)
                 await self.client.connect()
                 await asyncio.sleep(2)  # give time for slower connections
                 NostrClient.logger.info("Connected to relay.")
@@ -364,7 +359,7 @@ class NostrClient:
             except Exception as e:
                 raise RuntimeError(
                     f"Unable to connect to relay {self.relay}. Exception: {e}."
-                )
+                ) from e
 
     async def _async_publish_event(self, event_builder: EventBuilder) -> EventId:
         """
@@ -380,9 +375,9 @@ class NostrClient:
             await self._async_connect()
 
             # Add debug logging
-            NostrClient.logger.debug(f"Attempting to publish event: {event_builder}")
+            NostrClient.logger.debug("Attempting to publish event: %s", event_builder)
             NostrClient.logger.debug(
-                f"Using keys: {self.keys.public_key().to_bech32()}"
+                "Using keys: %s", self.keys.public_key().to_bech32()
             )
 
             # Wait for connection and try to publish
@@ -392,19 +387,18 @@ class NostrClient:
             if not output:
                 raise RuntimeError("No output received from send_event_builder")
             if len(output.success) == 0:
-                raise RuntimeError(
-                    f"Event rejected by relay. Reason: {output.message if hasattr(output, 'message') else 'unknown'}"
-                )
+                reason = getattr(output, "message", "unknown")
+                raise RuntimeError(f"Event rejected by relay. Reason: {reason}")
 
             NostrClient.logger.info(
-                f"Event published with event id: {output.id.to_bech32()}"
+                "Event published with event id: %s", output.id.to_bech32()
             )
             return output.id
 
         except Exception as e:
-            NostrClient.logger.error(f"Failed to publish event: {str(e)}")
+            NostrClient.logger.error("Failed to publish event: %s", str(e))
             NostrClient.logger.debug("Event details:", exc_info=True)
-            raise RuntimeError(f"Unable to publish event: {str(e)}")
+            raise RuntimeError(f"Unable to publish event: {str(e)}") from e
 
     async def _async_publish_note(self, text: str) -> EventId:
         """
@@ -424,7 +418,8 @@ class NostrClient:
 
     async def _async_publish_product(self, product: MerchantProduct) -> EventId:
         """
-        Asynchronous function to create or update a NIP-15 Marketplace product with event kind 30018
+        Asynchronous function to create or update a NIP-15
+        Marketplace product with event kind 30018
 
         Args:
             product: product to publish
@@ -443,7 +438,8 @@ class NostrClient:
         # We use the function to create the content field and discard the eventbuilder
         bad_event_builder = EventBuilder.product_data(product.to_product_data())
 
-        # create an event from bad_event_builder to extract the content - not broadcasted
+        # create an event from bad_event_builder to extract the content -
+        # not broadcasted
         bad_event = await self.client.sign_event_builder(bad_event_builder)
         content = bad_event.content()
 
@@ -451,7 +447,7 @@ class NostrClient:
         good_event_builder = EventBuilder(Kind(30018), content).tags(
             [Tag.identifier(product.id), Tag.coordinate(coordinate_tag)]
         )
-        self.logger.info("Product event: " + str(good_event_builder))
+        NostrClient.logger.info("Product event: %s", good_event_builder)
         return await self._async_publish_event(good_event_builder)
 
     async def _async_publish_profile(
@@ -480,7 +476,8 @@ class NostrClient:
 
     async def _async_publish_stall(self, stall: MerchantStall) -> EventId:
         """
-        Asynchronous function to create or update a NIP-15 Marketplace stall with event kind 30017
+        Asynchronous function to create or update a NIP-15
+        Marketplace stall with event kind 30017
 
         Args:
             stall: stall to be published
@@ -496,7 +493,7 @@ class NostrClient:
         #     [Tag.identifier(product.id), Tag.coordinate(coordinate_tag)]
         # )
 
-        self.logger.info(f" Merchant Stall: {stall}")
+        NostrClient.logger.info("Merchant Stall: %s", stall)
         event_builder = EventBuilder.stall_data(stall.to_stall_data()).tags(
             [
                 Tag.custom(
@@ -521,16 +518,16 @@ class NostrClient:
         try:
             await self._async_connect()
         except Exception as e:
-            raise RuntimeError("Unable to connect to the relay")
+            raise RuntimeError("Unable to connect to the relay") from e
 
         try:
-            filter = Filter().kind(Kind(30017))
+            events_filter = Filter().kind(Kind(30017))
             events = await self.client.fetch_events_from(
-                urls=[self.relay], filter=filter, timeout=timedelta(seconds=2)
+                urls=[self.relay], filter=events_filter, timeout=timedelta(seconds=2)
             )
             return events
         except Exception as e:
-            raise RuntimeError(f"Unable to retrieve stalls: {e}")
+            raise RuntimeError(f"Unable to retrieve stalls: {e}") from e
 
     async def _async_retrieve_products_from_seller(self, seller: PublicKey) -> Events:
         """
@@ -548,17 +545,17 @@ class NostrClient:
         try:
             await self._async_connect()
         except Exception as e:
-            raise RuntimeError("Unable to connect to the relay")
+            raise RuntimeError("Unable to connect to the relay") from e
 
         try:
             # print(f"Retrieving products from seller: {seller}")
-            filter = Filter().kind(Kind(30018)).authors([seller])
+            events_filter = Filter().kind(Kind(30018)).authors([seller])
             events = await self.client.fetch_events_from(
-                urls=[self.relay], filter=filter, timeout=timedelta(seconds=2)
+                urls=[self.relay], filter=events_filter, timeout=timedelta(seconds=2)
             )
             return events
         except Exception as e:
-            raise RuntimeError(f"Unable to retrieve stalls: {e}")
+            raise RuntimeError(f"Unable to retrieve stalls: {e}") from e
 
     async def _async_retrieve_profile(self, author: PublicKey) -> NostrProfile:
         """
@@ -576,7 +573,7 @@ class NostrClient:
         try:
             await self._async_connect()
         except Exception as e:
-            raise RuntimeError("Unable to connect to the relay")
+            raise RuntimeError("Unable to connect to the relay") from e
 
         try:
             metadata = await self.client.fetch_metadata(
@@ -584,7 +581,7 @@ class NostrClient:
             )
             return NostrProfile.from_metadata(metadata, author)
         except Exception as e:
-            raise RuntimeError(f"Unable to retrieve metadata: {e}")
+            raise RuntimeError(f"Unable to retrieve metadata: {e}") from e
 
     async def _async_retrieve_stalls_from_seller(self, seller: PublicKey) -> Events:
         """
@@ -602,16 +599,16 @@ class NostrClient:
         try:
             await self._async_connect()
         except Exception as e:
-            raise RuntimeError("Unable to connect to the relay")
+            raise RuntimeError("Unable to connect to the relay") from e
 
         try:
-            filter = Filter().kind(Kind(30017)).authors([seller])
+            events_filter = Filter().kind(Kind(30017)).authors([seller])
             events = await self.client.fetch_events_from(
-                urls=[self.relay], filter=filter, timeout=timedelta(seconds=2)
+                urls=[self.relay], filter=events_filter, timeout=timedelta(seconds=2)
             )
             return events
         except Exception as e:
-            raise RuntimeError(f"Unable to retrieve stalls: {e}")
+            raise RuntimeError(f"Unable to retrieve stalls: {e}") from e
 
 
 def generate_and_save_keys(env_var: str, env_path: Path) -> Keys:
@@ -635,7 +632,7 @@ def generate_and_save_keys(env_var: str, env_path: Path) -> Keys:
     # Read existing .env content
     env_content = ""
     if env_path.exists():
-        with open(env_path, "r") as f:
+        with open(env_path, "r", encoding="utf-8") as f:
             env_content = f.read()
 
     # Check if the env var already exists
@@ -655,7 +652,7 @@ def generate_and_save_keys(env_var: str, env_path: Path) -> Keys:
         new_lines.append(f"{env_var}={nsec}")
 
     # Write back to .env
-    with open(env_path, "w") as f:
+    with open(env_path, "w", encoding="utf-8") as f:
         f.write("\n".join(new_lines))
         if new_lines:  # Add final newline if there's content
             f.write("\n")

agentstr/nostr.pyi

@@ -1,3 +1,13 @@
+"""
+Type stubs for the Nostr module.
+
+This file provides type annotations for the Nostr module, enabling better
+type checking and autocompletion in IDEs. It defines the expected types
+for classes, functions, and variables used within the Nostr module.
+
+Note: This is a type stub file and does not contain any executable code.
+"""
+
 from logging import Logger
 from pathlib import Path
 from typing import ClassVar, List, Optional
@@ -17,7 +27,6 @@ from nostr_sdk import (  # type: ignore
     ShippingCost,
     ShippingMethod,
     StallData,
-    Tag,
     Timestamp,
 )
 
@@ -41,6 +50,11 @@ __all__ = [
 ]
 
 class NostrClient:
+    """
+    NostrClient implements the set of Nostr utilities required for higher level functions
+    implementations like the Marketplace.
+    """
+
     logger: ClassVar[Logger]
     relay: str
     keys: Keys

{agentstr-0.1.12.dist-info → agentstr-0.1.13.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.2
 Name: agentstr
-Version: 0.1.12
-Summary: Nostr extension for Agno AI agents
-Author-email: Synvya <info@synvya.com>
+Version: 0.1.13
+Summary: Tools for a Nostr agentic ecosystem
+Author-email: Synvya <synvya@synvya.com>
 License: MIT
 Project-URL: Homepage, https://www.synvya.com
 Project-URL: Repository, https://github.com/synvya/agentstr
@@ -13,18 +13,21 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: agno>=1.1.1
 Requires-Dist: openai>=1.50.0
-Requires-Dist: packaging>=24.0
 Requires-Dist: nostr_sdk>=0.39.0
 Requires-Dist: pydantic>=2.0.0
-Requires-Dist: cassandra-driver>=3.29.2
-Requires-Dist: cassio>=0.1.10
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: pytest-asyncio>=0.23.5; extra == "dev"
 Requires-Dist: black>=23.0; extra == "dev"
 Requires-Dist: isort>=5.0; extra == "dev"
 Requires-Dist: mypy>=1.0; extra == "dev"
-Requires-Dist: python-dotenv>=1.0; extra == "dev"
+Requires-Dist: pylint>=3.0; extra == "dev"
+Provides-Extra: examples
+Requires-Dist: python-dotenv>=1.0; extra == "examples"
+Requires-Dist: cassandra-driver>=3.29.2; extra == "examples"
+Requires-Dist: cassio>=0.1.10; extra == "examples"
+Requires-Dist: fastapi>=0.110.0; extra == "examples"
+Requires-Dist: uvicorn>=0.30.0; extra == "examples"
 
 # AgentStr
 

agentstr-0.1.13.dist-info/RECORD

@@ -0,0 +1,15 @@
+agentstr/__init__.py,sha256=rbFtFOldBSbeDX_8Xva3YHRC9c3nPFA9mJXS3UZhJ4s,1294
+agentstr/buyer.py,sha256=I1tApMjlq0Bg5Qk7twcAbF2rf_L5I2L9qzQO5sKv2RE,9912
+agentstr/buyer.pyi,sha256=AqdKa7nQWohxHaoKHjCNpOpDB6rsWGWAlASNhwEw45g,1219
+agentstr/merchant.py,sha256=3Fz4hrxyb5m7Kk47RodNC-Vyjm9iV7bI4ncPF8EMkhw,35078
+agentstr/merchant.pyi,sha256=mqak--H7D_b7o8JNQlQRmov2An-defyBGRJNhMNchXQ,1437
+agentstr/models.py,sha256=lEoopEQYIqI0egVxoXhBLlBh35C0WQmR_oBKm5Sexwk,11423
+agentstr/models.pyi,sha256=k1_D-afE17gybHhtQMqA6cx7H5lYh7Fg0gbXclxyP4A,2857
+agentstr/nostr.py,sha256=u2jDwQDmg01UCThDy1WW9lOPvAHyI1WMbtxFFi_2q08,22703
+agentstr/nostr.pyi,sha256=nlBdOOI6vPboACjBvrQZKHy3BtCjboaClG9ZVD2X8XQ,3118
+agentstr/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+agentstr-0.1.13.dist-info/LICENSE,sha256=20H0yoEDN5XO1xPXyZCyJjvSTP0YiarRMKWPfiaBhQY,1063
+agentstr-0.1.13.dist-info/METADATA,sha256=JBXZQ5tw7lPrir_3TKkbYYXpLMqHlMofkfdwXKTP6Gk,4667
+agentstr-0.1.13.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+agentstr-0.1.13.dist-info/top_level.txt,sha256=KZObFRHppZvKUGYB_m9w5HhLwps7jj7w6Xrw73dH2ss,9
+agentstr-0.1.13.dist-info/RECORD,,

agentstr-0.1.12.dist-info/RECORD

@@ -1,15 +0,0 @@
-agentstr/__init__.py,sha256=t2nKJcQ0cq3uYc5sadpJGXSO08UViAEfifCQE9pa068,800
-agentstr/buyer.py,sha256=rifdCC4FSmbLimA94AhSp3UaCA5vxtH61j_KgVJwkVo,9848
-agentstr/buyer.pyi,sha256=Zs2SbItabztcGg_cJF8_5Mf-p7Me34hxoFHEkC1inDU,1168
-agentstr/merchant.py,sha256=Uf3LkV5HlyuOZBA-covkUnDYaxI91yHvmVYOD8kk4cM,35225
-agentstr/merchant.pyi,sha256=bAYP8qz9GTGNeyFEkZsc4CqdCsC2HV4nrV0dWyYu1VY,1440
-agentstr/models.py,sha256=-anXkTmOANTKw-elxKG-RZCarCGBIWlUHiUoMBrE3FQ,11488
-agentstr/models.pyi,sha256=QVnjv01cuMynOjzuEcct72yO-LUWpdxEeiEzcf7QTl4,2867
-agentstr/nostr.py,sha256=VSC5gDN8XM54BSlfQ0yYv2N3DdTVVviWg5VJkJOD5R0,23199
-agentstr/nostr.pyi,sha256=A-Dq0ZVuZuXEXnMfgVhKRym4ubFnsSjFrgH1Db1JMCI,2647
-agentstr/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-agentstr-0.1.12.dist-info/LICENSE,sha256=20H0yoEDN5XO1xPXyZCyJjvSTP0YiarRMKWPfiaBhQY,1063
-agentstr-0.1.12.dist-info/METADATA,sha256=idnYX1pNr1qsbQXDOTdHmmPBEy3pa9RLdinZn6PeIsE,4475
-agentstr-0.1.12.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-agentstr-0.1.12.dist-info/top_level.txt,sha256=KZObFRHppZvKUGYB_m9w5HhLwps7jj7w6Xrw73dH2ss,9
-agentstr-0.1.12.dist-info/RECORD,,