agentstr 0.1.12__tar.gz → 0.1.14__tar.gz

{agentstr-0.1.12/src/agentstr.egg-info → agentstr-0.1.14}/PKG-INFO

@@ -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.14
+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.12 → agentstr-0.1.14}/pyproject.toml

@@ -4,22 +4,19 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "agentstr"
-version = "0.1.12"
-description = "Nostr extension for Agno AI agents"
+version = "0.1.14"
+description = "Tools for a Nostr agentic ecosystem"
 readme = "README.md"
 requires-python = ">=3.9, <3.13"
 license = { text = "MIT" }
 authors = [
-    {name = "Synvya", email = "info@synvya.com"}
+    {name = "Synvya", email = "synvya@synvya.com"}
 ]
 dependencies = [
     "agno>=1.1.1",
     "openai>=1.50.0",
-    "packaging>=24.0",
     "nostr_sdk>=0.39.0",
-    "pydantic>=2.0.0",
-    "cassandra-driver>=3.29.2",
-    "cassio>=0.1.10",
+    "pydantic>=2.0.0",   
 ]
 
 [project.optional-dependencies]
@@ -29,7 +26,14 @@ dev = [
     "black>=23.0",
     "isort>=5.0",
     "mypy>=1.0",
+    "pylint>=3.0",
+]
+examples = [
     "python-dotenv>=1.0",
+    "cassandra-driver>=3.29.2",
+    "cassio>=0.1.10",
+    "fastapi>=0.110.0",
+    "uvicorn>=0.30.0",
 ]
 
 [project.urls]

agentstr-0.1.14/src/agentstr/__init__.py

@@ -0,0 +1,49 @@
+"""
+AgentStr: Nostr extension for Agno AI agents
+"""
+
+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
+from .models import AgentProfile, MerchantProduct, MerchantStall, NostrProfile
+
+# Import version from pyproject.toml at runtime
+try:
+    __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",
+    # Nostr-related utils
+    "EventId",
+    "Keys",
+    "Kind",
+    "NostrClient",
+    "generate_and_save_keys",
+    "Timestamp",
+    # Models
+    "AgentProfile",
+    "NostrProfile",
+]

{agentstr-0.1.12 → agentstr-0.1.14}/src/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-0.1.12 → agentstr-0.1.14}/src/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-0.1.12 → agentstr-0.1.14}/src/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-0.1.12 → agentstr-0.1.14}/src/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: ...