agentstr 0.1.11__tar.gz → 0.1.12__tar.gz

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

@@ -1,7 +1,7 @@
 Metadata-Version: 2.2
 Name: agentstr
-Version: 0.1.11
-Summary: Nostr extension for Phidata AI agents
+Version: 0.1.12
+Summary: Nostr extension for Agno AI agents
 Author-email: Synvya <info@synvya.com>
 License: MIT
 Project-URL: Homepage, https://www.synvya.com
@@ -11,13 +11,16 @@ Project-URL: BugTracker, https://github.com/synvya/agentstr/issues
 Requires-Python: <3.13,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: phidata>=2.7.0
+Requires-Dist: agno>=1.1.1
 Requires-Dist: openai>=1.50.0
 Requires-Dist: packaging>=24.0
-Requires-Dist: nostr-sdk>=0.38.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"
@@ -25,7 +28,7 @@ Requires-Dist: python-dotenv>=1.0; extra == "dev"
 
 # AgentStr
 
-AgentStr is an extension of [Phidata](https://www.phidata.com) AI agents that enables peer-to-peer agent communication using the Nostr protocol.
+AgentStr is an extension of [Agno](https://www.agno.ai) AI agents that enables peer-to-peer agent communication using the Nostr protocol.
 
 ## Overview
 
@@ -41,8 +44,15 @@ agentstr/
 ├── src/              # Source code
 │   └── agentstr/
 │       ├── __init__.py
-│       ├── marketplace.py
-│       └── nostr.py
+│       ├── buyer.py
+│       ├── buyer.pyi
+│       ├── merchant.py
+│       ├── merchant.pyi
+│       ├── models.py
+│       ├── models.pyi
+│       ├── nostr.py
+│       ├── nostr.pyi
+│       └── py.typed
 ├── tests/            # Test files
 ├── docs/             # Documentation
 ├── examples/         # Example implementations
@@ -52,17 +62,19 @@ agentstr/
 ## Features
 
 ### Current Features
-- Create Merchant agents with Nostr identities
-- Publish and manage merchant products using [NIP-15](https://github.com/nostr-protocol/nips/blob/master/15.md) marketplace protocol
-- Create merchant stalls to organize products
-- Handle shipping zones and costs
-- Secure communication using Nostr keys
+- Create Merchant agents with Nostr identities:
+  - Publish and manage merchant products using [NIP-15](https://github.com/nostr-protocol/nips/blob/master/15.md) marketplace protocol
+  - Create merchant stalls to organize products
+  - Handle shipping zones and costs
+  - Secure communication using Nostr keys
+- Create Buyer agents:
+  - Retrieve a list of sellers from the relay using [NIP-15](https://github.com/nostr-protocol/nips/blob/master/15.md) marketplace protocol
+  - Find an specific seller by name or public key
+  - Refresh the list of sellers from the relay
 
 ### Roadmap
 - [ ] Create marketplace with stalls
-- [ ] Create Buyer agents
-- [ ] Enable merchants to define products
-- [ ] Add customer toolkit for buyers
+- [ ] Expand buyer agent to include more features
 - [ ] Support additional Nostr NIPs
 - [ ] Add more agent interaction patterns
 
@@ -82,46 +94,13 @@ pip install agentstr
 
 You can find example code in the [examples](https://github.com/Synvya/agentstr/tree/main/examples/) directory.
 
-### Instaling the examples
-1. **Clone the repository**
-```bash
-git clone https://github.com/Synvya/agentstr.git
-```
-
-### Basic CLI Example
-A simple command-line interface demonstrating agentstr's merchant capabilities:
-
-
-- [Basic CLI Agent](https://github.com/Synvya/agentstr/tree/main/src/agentstr/examples/basic_cli/main.py) - A complete example showing:
-  - Setting up merchant profiles
-  - Creating stalls with shipping methods
-  - Defining products with shipping costs
-  - Configuring the agent with the merchant toolkit
-  - Running an interactive CLI application
-
-1. ** Create a virtual environment**
-```bash
-cd agentstr/examples/basic_cli
-python3 -m venv venv
-source venv/bin/activate
-```
+To install the examples clone the repository and navigate to the examples directory:
 
-2. ** Install dependencies**
 ```bash
-pip install -r requirements.txt
-```
-
-3. ** Configure your environment**
-```bash
-cp .env.example .env
-```
-**Edit the .env file with your own API keys and Nostr credentials**
-
-4. ** Run the example**
-```bash
-python main.py
+git clone https://github.com/Synvya/agentstr.git
+cd agentstr/examples/
 ```
-
+Each example has its own README with instructions on how to run it.
 
 ## Documentation
 
@@ -140,7 +119,11 @@ This project is licensed under the MIT License - see the [LICENSE](https://githu
 
 ## Acknowledgments
 
-- [Phidata](https://www.phidata.com) - For their AI agent framework
+- [Agno](https://www.agno.ai) - For their AI agent framework
 - [Rust-Nostr](https://rust-nostr.org) - For their Python Nostr SDK
 - [Nostr Protocol](https://github.com/nostr-protocol/nips) - For the protocol specification
 
+This software includes the following software licensed under the [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0):
+- [DataStax Python Driver for Apache Cassandra](https://github.com/datastax/python-driver)
+- [cassIO](https://github.com/CassioML/cassio). This library is not maintained anymore. We will need to replace it with a new library.
+

{agentstr-0.1.11 → agentstr-0.1.12}/README.md

@@ -1,6 +1,6 @@
 # AgentStr
 
-AgentStr is an extension of [Phidata](https://www.phidata.com) AI agents that enables peer-to-peer agent communication using the Nostr protocol.
+AgentStr is an extension of [Agno](https://www.agno.ai) AI agents that enables peer-to-peer agent communication using the Nostr protocol.
 
 ## Overview
 
@@ -16,8 +16,15 @@ agentstr/
 ├── src/              # Source code
 │   └── agentstr/
 │       ├── __init__.py
-│       ├── marketplace.py
-│       └── nostr.py
+│       ├── buyer.py
+│       ├── buyer.pyi
+│       ├── merchant.py
+│       ├── merchant.pyi
+│       ├── models.py
+│       ├── models.pyi
+│       ├── nostr.py
+│       ├── nostr.pyi
+│       └── py.typed
 ├── tests/            # Test files
 ├── docs/             # Documentation
 ├── examples/         # Example implementations
@@ -27,17 +34,19 @@ agentstr/
 ## Features
 
 ### Current Features
-- Create Merchant agents with Nostr identities
-- Publish and manage merchant products using [NIP-15](https://github.com/nostr-protocol/nips/blob/master/15.md) marketplace protocol
-- Create merchant stalls to organize products
-- Handle shipping zones and costs
-- Secure communication using Nostr keys
+- Create Merchant agents with Nostr identities:
+  - Publish and manage merchant products using [NIP-15](https://github.com/nostr-protocol/nips/blob/master/15.md) marketplace protocol
+  - Create merchant stalls to organize products
+  - Handle shipping zones and costs
+  - Secure communication using Nostr keys
+- Create Buyer agents:
+  - Retrieve a list of sellers from the relay using [NIP-15](https://github.com/nostr-protocol/nips/blob/master/15.md) marketplace protocol
+  - Find an specific seller by name or public key
+  - Refresh the list of sellers from the relay
 
 ### Roadmap
 - [ ] Create marketplace with stalls
-- [ ] Create Buyer agents
-- [ ] Enable merchants to define products
-- [ ] Add customer toolkit for buyers
+- [ ] Expand buyer agent to include more features
 - [ ] Support additional Nostr NIPs
 - [ ] Add more agent interaction patterns
 
@@ -57,46 +66,13 @@ pip install agentstr
 
 You can find example code in the [examples](https://github.com/Synvya/agentstr/tree/main/examples/) directory.
 
-### Instaling the examples
-1. **Clone the repository**
-```bash
-git clone https://github.com/Synvya/agentstr.git
-```
-
-### Basic CLI Example
-A simple command-line interface demonstrating agentstr's merchant capabilities:
-
-
-- [Basic CLI Agent](https://github.com/Synvya/agentstr/tree/main/src/agentstr/examples/basic_cli/main.py) - A complete example showing:
-  - Setting up merchant profiles
-  - Creating stalls with shipping methods
-  - Defining products with shipping costs
-  - Configuring the agent with the merchant toolkit
-  - Running an interactive CLI application
-
-1. ** Create a virtual environment**
-```bash
-cd agentstr/examples/basic_cli
-python3 -m venv venv
-source venv/bin/activate
-```
+To install the examples clone the repository and navigate to the examples directory:
 
-2. ** Install dependencies**
 ```bash
-pip install -r requirements.txt
-```
-
-3. ** Configure your environment**
-```bash
-cp .env.example .env
-```
-**Edit the .env file with your own API keys and Nostr credentials**
-
-4. ** Run the example**
-```bash
-python main.py
+git clone https://github.com/Synvya/agentstr.git
+cd agentstr/examples/
 ```
-
+Each example has its own README with instructions on how to run it.
 
 ## Documentation
 
@@ -115,7 +91,11 @@ This project is licensed under the MIT License - see the [LICENSE](https://githu
 
 ## Acknowledgments
 
-- [Phidata](https://www.phidata.com) - For their AI agent framework
+- [Agno](https://www.agno.ai) - For their AI agent framework
 - [Rust-Nostr](https://rust-nostr.org) - For their Python Nostr SDK
 - [Nostr Protocol](https://github.com/nostr-protocol/nips) - For the protocol specification
 
+This software includes the following software licensed under the [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0):
+- [DataStax Python Driver for Apache Cassandra](https://github.com/datastax/python-driver)
+- [cassIO](https://github.com/CassioML/cassio). This library is not maintained anymore. We will need to replace it with a new library.
+

{agentstr-0.1.11 → agentstr-0.1.12}/pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "agentstr"
-version = "0.1.11"
-description = "Nostr extension for Phidata AI agents"
+version = "0.1.12"
+description = "Nostr extension for Agno AI agents"
 readme = "README.md"
 requires-python = ">=3.9, <3.13"
 license = { text = "MIT" }
@@ -13,16 +13,19 @@ authors = [
     {name = "Synvya", email = "info@synvya.com"}
 ]
 dependencies = [
-    "phidata>=2.7.0",
+    "agno>=1.1.1",
     "openai>=1.50.0",
     "packaging>=24.0",
-    "nostr-sdk>=0.38.0",
+    "nostr_sdk>=0.39.0",
     "pydantic>=2.0.0",
+    "cassandra-driver>=3.29.2",
+    "cassio>=0.1.10",
 ]
 
 [project.optional-dependencies]
 dev = [
     "pytest>=7.0",
+    "pytest-asyncio>=0.23.5",
     "black>=23.0",
     "isort>=5.0",
     "mypy>=1.0",
@@ -55,7 +58,18 @@ python_version = "3.9"
 warn_return_any = true
 warn_unused_configs = true
 mypy_path = "src"
+check_untyped_defs = true
+disallow_untyped_defs = true
 
 [[tool.mypy.overrides]]
 module = ["nostr_sdk.*"]
-ignore_missing_imports = true
+ignore_missing_imports = true
+
+[tool.setuptools.package-data]
+agentstr = ["py.typed"]
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+markers = [
+    "asyncio: mark test as async",
+]

agentstr-0.1.12/src/agentstr/__init__.py

@@ -0,0 +1,37 @@
+"""
+AgentStr: Nostr extension for Agno AI agents
+"""
+
+from nostr_sdk import ShippingCost, ShippingMethod  # type: ignore
+
+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:
+    from importlib.metadata import version
+
+    __version__ = version("agentstr")
+except Exception:
+    __version__ = "unknown"
+
+__all__ = [
+    "MerchantTools",
+    "MerchantProduct",
+    "MerchantStall",
+    "ShippingCost",
+    "ShippingMethod",
+]
+
+from agentstr.nostr import EventId, Keys, NostrClient, ProductData, StallData
+
+__all__ = [
+    "EventId",
+    "Keys",
+    "NostrClient",
+    "ProductData",
+    "StallData",
+    "AgentProfile",
+]

agentstr-0.1.12/src/agentstr/buyer.py

@@ -0,0 +1,291 @@
+import json
+import logging
+from uuid import uuid4
+
+from agno.agent import AgentKnowledge  # type: ignore
+from agno.document.base import Document
+
+from agentstr.models import AgentProfile, NostrProfile
+from agentstr.nostr import NostrClient, PublicKey
+
+try:
+    from agno.tools import Toolkit
+except ImportError:
+    raise ImportError("`agno` not installed. Please install using `pip install agno`")
+
+
+def _map_location_to_geohash(location: str) -> str:
+    """
+    Map a location to a geohash.
+
+    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.
+
+    Returns:
+        str: geohash of the location or empty string if location is not found
+    """
+    if "snoqualmie" in location.lower():
+        return "C23Q7U36W"
+    else:
+        return ""
+
+
+class BuyerTools(Toolkit):
+    """
+    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.
+    Sellers cache can be refreshed from the Nostr relay.
+    Sellers can be retrieved as a list of Nostr profiles.
+
+    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
+    )
+
+    logger = logging.getLogger("Buyer")
+    sellers: set[NostrProfile] = set()
+
+    def __init__(
+        self,
+        knowledge_base: AgentKnowledge,
+        buyer_profile: AgentProfile,
+        relay: str,
+    ) -> None:
+        """Initialize the Buyer toolkit.
+
+        Args:
+            knowledge_base: knowledge base of the buyer agent
+            buyer_profile: profile of the buyer using this agent
+            relay: Nostr relay to use for communications
+        """
+        super().__init__(name="Buyer")
+
+        self.relay = relay
+        self.buyer_profile = buyer_profile
+        self.knowledge_base = knowledge_base
+        # Initialize fields
+        self._nostr_client = NostrClient(relay, buyer_profile.get_private_key())
+
+        # Register methods
+        self.register(self.find_seller_by_name)
+        self.register(self.find_seller_by_public_key)
+        self.register(self.find_sellers_by_location)
+        self.register(self.get_profile)
+        self.register(self.get_relay)
+        self.register(self.get_seller_stalls)
+        self.register(self.get_seller_products)
+        self.register(self.get_seller_count)
+        self.register(self.get_sellers)
+        self.register(self.refresh_sellers)
+        self.register(self.purchase_product)
+
+    def purchase_product(self, product: str) -> str:
+        """Purchase a product.
+
+        Args:
+            product: JSON string with product to purchase
+        """
+        return json.dumps({"status": "success", "message": "Product purchased"})
+
+    def find_seller_by_name(self, name: str) -> str:
+        """Find a seller by name.
+
+        Args:
+            name: name of the seller to find
+
+        Returns:
+            str: JSON string with seller profile or error message
+        """
+        for seller in self.sellers:
+            if seller.get_name() == name:
+                response = seller.to_json()
+                # self._store_response_in_knowledge_base(response)
+                return response
+        response = json.dumps({"status": "error", "message": "Seller not found"})
+        self._store_response_in_knowledge_base(response)
+        return response
+
+    def find_seller_by_public_key(self, public_key: str) -> str:
+        """Find a seller by public key.
+
+        Args:
+            public_key: bech32 encoded public key of the seller to find
+
+        Returns:
+            str: seller profile json string or error message
+        """
+        for seller in self.sellers:
+            if seller.get_public_key() == public_key:
+                response = seller.to_json()
+                # self._store_response_in_knowledge_base(response)
+                return response
+        response = json.dumps({"status": "error", "message": "Seller not found"})
+        self._store_response_in_knowledge_base(response)
+        return response
+
+    def find_sellers_by_location(self, location: str) -> str:
+        """Find sellers by location.
+
+        Args:
+            location: location of the seller to find (e.g. "San Francisco, CA")
+
+        Returns:
+            str: list of seller profile json strings or error message
+        """
+        sellers: set[NostrProfile] = set()
+        geohash = _map_location_to_geohash(location)
+        # print(f"find_sellers_by_location: geohash: {geohash}")
+
+        if not geohash:
+            response = json.dumps({"status": "error", "message": "Invalid location"})
+            return response
+
+        # 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:
+            response = json.dumps(
+                {"status": "error", "message": f"No sellers found near {location}"}
+            )
+            return response
+
+        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}")
+        return response
+
+    def get_profile(self) -> str:
+        """Get the Nostr profile of the buyer agent.
+
+        Returns:
+            str: buyer profile json string
+        """
+        response = self.buyer_profile.to_json()
+        self._store_response_in_knowledge_base(response)
+        return response
+
+    def get_relay(self) -> str:
+        """Get the Nostr relay that the buyer agent is using.
+
+        Returns:
+            str: Nostr relay
+        """
+        response = self.relay
+        # self._store_response_in_knowledge_base(response)
+        return response
+
+    def get_seller_stalls(self, public_key: str) -> str:
+        """Get the stalls from a seller.
+
+        Args:
+            public_key: public key of the seller
+
+        Returns:
+            str: JSON string with seller collections
+        """
+        try:
+            stalls = self._nostr_client.retrieve_stalls_from_seller(
+                PublicKey.parse(public_key)
+            )
+            response = json.dumps([stall.as_json() for stall in stalls])
+            self._store_response_in_knowledge_base(response)
+            return response
+        except Exception as e:
+            response = json.dumps({"status": "error", "message": str(e)})
+            return response
+
+    def get_seller_count(self) -> str:
+        """Get the number of sellers.
+
+        Returns:
+            str: JSON string with status and count of sellers
+        """
+        response = json.dumps({"status": "success", "count": len(self.sellers)})
+        return response
+
+    def get_seller_products(self, public_key: str) -> str:
+        """Get the products from a seller
+
+        Args:
+            public_key: public key of the seller
+
+        Returns:
+            str: JSON string with seller products
+        """
+        try:
+            products = self._nostr_client.retrieve_products_from_seller(
+                PublicKey.parse(public_key)
+            )
+
+            response = json.dumps([product.to_dict() for product in products])
+            self._store_response_in_knowledge_base(response)
+            return response
+        except Exception as e:
+            response = json.dumps({"status": "error", "message": str(e)})
+            return response
+
+    def get_sellers(self) -> str:
+        """Get the list of sellers.
+        If no sellers are cached, the list is refreshed from the Nostr relay.
+        If sellers are cached, the list is returned from the cache.
+        To get a fresh list of sellers, call refresh_sellers() sellers first.
+
+        Returns:
+            str: list of sellers json strings
+        """
+        if not self.sellers:
+            self._refresh_sellers()
+        response = json.dumps([seller.to_json() for seller in self.sellers])
+        return response
+
+    def refresh_sellers(self) -> str:
+        """Refresh the list of sellers.
+
+        Returns:
+            str: JSON string with status and count of sellers refreshed
+        """
+        self._refresh_sellers()
+        response = json.dumps({"status": "success", "count": len(self.sellers)})
+        return response
+
+    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.
+
+        Returns:
+            List[NostrProfile]: List of Nostr profiles of all sellers.
+        """
+        sellers = self._nostr_client.retrieve_sellers()
+        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.sellers = sellers
+
+    def _store_response_in_knowledge_base(self, response: str) -> None:
+        doc = Document(
+            id=str(uuid4()),
+            content=response,
+        )
+        # print(f"Document length: {len(doc.content.split())} words")
+        self.knowledge_base.load_documents([doc])  # Store response in Cassandra

agentstr-0.1.12/src/agentstr/buyer.pyi

@@ -0,0 +1,31 @@
+from logging import Logger
+from typing import ClassVar
+
+from agno.agent import AgentKnowledge
+from agno.tools import Toolkit
+
+from agentstr.models import AgentProfile, NostrProfile
+from agentstr.nostr import NostrClient
+
+class BuyerTools(Toolkit):
+    logger: ClassVar[Logger]
+    sellers: set[NostrProfile]
+    relay: str
+    _nostr_client: NostrClient
+
+    def __init__(
+        self, knowledge_base: AgentKnowledge, buyer_profile: AgentProfile, relay: str
+    ) -> None: ...
+    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_profile(self) -> str: ...
+    def get_relay(self) -> str: ...
+    def get_seller_stalls(self, public_key: str) -> str: ...
+    def get_seller_count(self) -> str: ...
+    def get_seller_products(self, public_key: str) -> str: ...
+    def get_sellers(self) -> str: ...
+    def purchase_product(self, product: str) -> str: ...
+    def refresh_sellers(self) -> str: ...
+    def _refresh_sellers(self) -> None: ...
+    def _store_response_in_knowledge_base(self, response: str) -> None: ...