agentstr 0.1.14__tar.gz → 0.1.16__tar.gz

agentstr-0.1.16/MANIFEST.in

@@ -0,0 +1,7 @@
+include LICENSE README.md
+global-exclude __pycache__
+global-exclude *.py[cod]
+
+# Explicitly exclude tests/ from source distribution (sdist)
+global-exclude tests/*
+global-exclude tests/**/*

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: agentstr
-Version: 0.1.14
+Version: 0.1.16
 Summary: Tools for a Nostr agentic ecosystem
 Author-email: Synvya <synvya@synvya.com>
 License: MIT
@@ -8,7 +8,7 @@ Project-URL: Homepage, https://www.synvya.com
 Project-URL: Repository, https://github.com/synvya/agentstr
 Project-URL: Documentation, https://github.com/synvya/agentstr#readme
 Project-URL: BugTracker, https://github.com/synvya/agentstr/issues
-Requires-Python: <3.13,>=3.9
+Requires-Python: <3.13,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: agno>=1.1.1
@@ -24,8 +24,10 @@ Requires-Dist: mypy>=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: psycopg[binary]>=3.2.5; extra == "examples"
+Requires-Dist: sqlalchemy>=2.0.0; extra == "examples"
+Requires-Dist: nest-asyncio>=1.6.0; extra == "examples"
+Requires-Dist: pgvector>=0.3.6; extra == "examples"
 Requires-Dist: fastapi>=0.110.0; extra == "examples"
 Requires-Dist: uvicorn>=0.30.0; extra == "examples"
 
@@ -126,7 +128,3 @@ This project is licensed under the MIT License - see the [LICENSE](https://githu
 - [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.14 → agentstr-0.1.16}/README.md

@@ -95,7 +95,3 @@ This project is licensed under the MIT License - see the [LICENSE](https://githu
 - [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.14 → agentstr-0.1.16}/pyproject.toml

@@ -4,10 +4,10 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "agentstr"
-version = "0.1.14"
+version = "0.1.16"
 description = "Tools for a Nostr agentic ecosystem"
 readme = "README.md"
-requires-python = ">=3.9, <3.13"
+requires-python = ">=3.10, <3.13"
 license = { text = "MIT" }
 authors = [
     {name = "Synvya", email = "synvya@synvya.com"}
@@ -30,8 +30,10 @@ dev = [
 ]
 examples = [
     "python-dotenv>=1.0",
-    "cassandra-driver>=3.29.2",
-    "cassio>=0.1.10",
+    "psycopg[binary]>=3.2.5",
+    "sqlalchemy>=2.0.0",
+    "nest-asyncio>=1.6.0",
+    "pgvector>=0.3.6",
     "fastapi>=0.110.0",
     "uvicorn>=0.30.0",
 ]
@@ -45,6 +47,8 @@ BugTracker = "https://github.com/synvya/agentstr/issues"
 [tool.setuptools]
 package-dir = {"" = "src"}
 packages = ["agentstr"]
+exclude-package-data = {"*" = ["tests/*", "tests/**/*"]}
+
 
 [tool.black]
 line-length = 88
@@ -58,7 +62,7 @@ src_paths = ["src", "tests", "examples"]
 multi_line_output = 3
 
 [tool.mypy]
-python_version = "3.9"
+python_version = "3.10"
 warn_return_any = true
 warn_unused_configs = true
 mypy_path = "src"
@@ -76,4 +80,4 @@ agentstr = ["py.typed"]
 asyncio_mode = "auto"
 markers = [
     "asyncio: mark test as async",
-]
+]

{agentstr-0.1.14 → agentstr-0.1.16}/src/agentstr/__init__.py

@@ -5,7 +5,7 @@ AgentStr: Nostr extension for Agno AI agents
 import importlib.metadata
 import logging
 
-from nostr_sdk import ShippingCost, ShippingMethod, Timestamp  # type: ignore
+from nostr_sdk import PublicKey, ShippingCost, ShippingMethod, Timestamp  # type: ignore
 
 from agentstr.nostr import EventId, Keys, Kind, NostrClient, generate_and_save_keys
 
@@ -43,6 +43,7 @@ __all__ = [
     "NostrClient",
     "generate_and_save_keys",
     "Timestamp",
+    "PublicKey",
     # Models
     "AgentProfile",
     "NostrProfile",

{agentstr-0.1.14 → agentstr-0.1.16}/src/agentstr/buyer.py

@@ -4,7 +4,6 @@ Module implementing the BuyerTools Toolkit for Agno agents.
 
 import json
 import logging
-from uuid import uuid4
 
 from pydantic import ConfigDict
 
@@ -82,6 +81,8 @@ class BuyerTools(Toolkit):
         self._nostr_client = NostrClient(relay, buyer_profile.get_private_key())
 
         # Register methods
+        self.register(self.download_all_sellers)
+        self.register(self.download_sellers_from_marketplace)
         self.register(self.find_seller_by_name)
         self.register(self.find_seller_by_public_key)
         self.register(self.find_sellers_by_location)
@@ -91,7 +92,6 @@ class BuyerTools(Toolkit):
         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:
@@ -107,6 +107,30 @@ class BuyerTools(Toolkit):
             {"status": "success", "message": f"Product {product} purchased"}
         )
 
+    def download_all_sellers(self) -> str:
+        """Download all sellers from the Nostr relay.
+
+        Returns:
+            str: JSON string with status and count of sellers refreshed
+        """
+        self._download_all_sellers()
+        response = json.dumps({"status": "success", "count": len(self.sellers)})
+        return response
+
+    def download_sellers_from_marketplace(self, owner: str, name: str) -> str:
+        """Download sellers from a marketplace.
+
+        Args:
+            owner: bech32 encoded public key of the owner of the marketplace
+            name: name of the marketplace to download sellers from
+
+        Returns:
+            str: JSON string with status and count of sellers downloaded
+        """
+        self._download_sellers_from_marketplace(PublicKey.parse(owner), name)
+        response = json.dumps({"status": "success", "count": len(self.sellers)})
+        return response
+
     def find_seller_by_name(self, name: str) -> str:
         """Find a seller by name.
 
@@ -256,37 +280,23 @@ class BuyerTools(Toolkit):
             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.
+        """Get the list of sellers cached in the BuyerTools instance.
+        To get a fresh list of sellers, call download_all_sellers() or
+        get_sellers_from_marketplace() first.
 
         Returns:
             str: list of sellers json strings
         """
-        if not self.sellers:
-            self._refresh_sellers()
+        # 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:
+    def _download_all_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
+        Internal fucntion to retrieve a new set of sellers from the Nostr relay.
+        The old set is discarded and the new set 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:
@@ -296,10 +306,22 @@ class BuyerTools(Toolkit):
 
         self.sellers = sellers
 
+    def _download_sellers_from_marketplace(self, owner: PublicKey, name: str) -> None:
+        """
+        Internal function to download sellers from a marketplace and store them as
+        the new set of sellers for the BuyerTools instance.
+
+        Args:
+            owner: PublicKey of the owner of the marketplace
+            name: name of the marketplace to download sellers from
+        """
+        sellers = self._nostr_client.retrieve_marketplace(owner, name)
+        self.sellers = sellers
+
     def _store_response_in_knowledge_base(self, response: str) -> None:
         doc = Document(
-            id=str(uuid4()),
+            # id=str(uuid4()),
             content=response,
         )
-        # print(f"Document length: {len(doc.content.split())} words")
+        print(f"Document length: {len(doc.content.split())} words")
         self.knowledge_base.load_documents([doc])  # Store response in Cassandra

{agentstr-0.1.14 → agentstr-0.1.16}/src/agentstr/buyer.pyi

@@ -5,7 +5,7 @@ from agno.agent import AgentKnowledge
 from agno.tools import Toolkit
 
 from agentstr.models import AgentProfile, NostrProfile
-from agentstr.nostr import NostrClient
+from agentstr.nostr import NostrClient, PublicKey
 
 class BuyerTools(Toolkit):
     logger: ClassVar[Logger]
@@ -16,6 +16,8 @@ class BuyerTools(Toolkit):
     def __init__(
         self, knowledge_base: AgentKnowledge, buyer_profile: AgentProfile, relay: str
     ) -> None: ...
+    def download_sellers_from_marketplace(self, owner: PublicKey, name: str) -> str: ...
+    def download_all_sellers(self) -> str: ...
     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: ...
@@ -27,6 +29,8 @@ class BuyerTools(Toolkit):
     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 _download_all_sellers(self) -> None: ...
+    def _download_sellers_from_marketplace(
+        self, owner: PublicKey, name: str
+    ) -> None: ...
     def _store_response_in_knowledge_base(self, response: str) -> None: ...

{agentstr-0.1.14 → agentstr-0.1.16}/src/agentstr/merchant.py

@@ -437,6 +437,8 @@ class MerchantTools(Toolkit):
                 self.merchant_profile.get_name(),
                 self.merchant_profile.get_about(),
                 self.merchant_profile.get_picture(),
+                self.merchant_profile.get_banner(),
+                self.merchant_profile.get_website(),
             )
             return json.dumps(event_id.__dict__)
         except RuntimeError as e:

{agentstr-0.1.14 → agentstr-0.1.16}/src/agentstr/models.py

@@ -31,6 +31,7 @@ class Profile:
 
     def __init__(self) -> None:
         self.about = ""
+        self.banner = ""
         self.display_name = ""
         self.name = ""
         self.picture = ""
@@ -39,6 +40,9 @@ class Profile:
     def get_about(self) -> str:
         return self.about
 
+    def get_banner(self) -> str:
+        return self.banner
+
     def get_display_name(self) -> str:
         return self.display_name
 
@@ -54,6 +58,9 @@ class Profile:
     def set_about(self, about: str) -> None:
         self.about = about
 
+    def set_banner(self, banner: str) -> None:
+        self.banner = banner
+
     def set_display_name(self, display_name: str) -> None:
         self.display_name = display_name
 
@@ -71,6 +78,7 @@ class Profile:
             "name": self.name,
             "display_name": self.display_name,
             "about": self.about,
+            "banner": self.banner,
             "picture": self.picture,
             "website": self.website,
         }
@@ -85,12 +93,12 @@ class NostrProfile(Profile):
     a third party profile and therefore it only has a public key.
     """
 
-    WEB_URL: str = "https://primal.net/p/"
+    PROFILE_URL_PREFIX: str = "https://primal.net/p/"
 
     def __init__(self, public_key: PublicKey) -> None:
         super().__init__()
         self.public_key = public_key
-        self.profile_url = self.WEB_URL + self.public_key.to_bech32()
+        self.profile_url = self.PROFILE_URL_PREFIX + self.public_key.to_bech32()
         # Initialize the locations set here, per-instance
         self.locations: set[str] = set()
 
@@ -98,6 +106,7 @@ class NostrProfile(Profile):
     def from_metadata(cls, metadata: Metadata, public_key: PublicKey) -> "NostrProfile":
         profile = cls(public_key)
         profile.set_about(metadata.get_about())
+        profile.set_banner(metadata.get_banner())
         profile.set_display_name(metadata.get_display_name())
         profile.set_name(metadata.get_name())
         profile.set_picture(metadata.get_picture())
@@ -171,6 +180,7 @@ class NostrProfile(Profile):
             "name": self.name,
             "display_name": self.display_name,
             "about": self.about,
+            "banner": self.banner,
             "picture": self.picture,
             "website": self.website,
         }
@@ -181,17 +191,18 @@ class AgentProfile(Profile):
     AgentProfile is a Profile that is used to represent an agent.
     """
 
-    WEB_URL: str = "https://primal.net/p/"
+    PROFILE_URL_PREFIX: str = "https://primal.net/p/"
 
     def __init__(self, keys: Keys) -> None:
         super().__init__()
         self.keys = keys
-        self.profile_url = self.WEB_URL + self.keys.public_key().to_bech32()
+        self.profile_url = self.PROFILE_URL_PREFIX + self.keys.public_key().to_bech32()
 
     @classmethod
     def from_metadata(cls, metadata: Metadata, keys: Keys) -> "AgentProfile":
         profile = cls(keys)
         profile.set_about(metadata.get_about())
+        profile.set_banner(metadata.get_banner())
         profile.set_display_name(metadata.get_display_name())
         profile.set_name(metadata.get_name())
         profile.set_picture(metadata.get_picture())

{agentstr-0.1.14 → agentstr-0.1.16}/src/agentstr/models.pyi

@@ -19,6 +19,7 @@ class Profile:
 
     logger: ClassVar[Logger]
     about: str
+    banner: str
     display_name: str
     name: str
     picture: str
@@ -26,11 +27,13 @@ class Profile:
 
     def __init__(self) -> None: ...
     def get_about(self) -> str: ...
+    def get_banner(self) -> str: ...
     def get_display_name(self) -> str: ...
     def get_name(self) -> str: ...
     def get_picture(self) -> str: ...
     def get_website(self) -> str: ...
     def set_about(self, about: str) -> None: ...
+    def set_banner(self, banner: str) -> None: ...
     def set_display_name(self, display_name: str) -> None: ...
     def set_name(self, name: str) -> None: ...
     def set_picture(self, picture: str) -> None: ...
@@ -38,7 +41,7 @@ class Profile:
     def to_json(self) -> str: ...
 
 class AgentProfile(Profile):
-    WEB_URL: ClassVar[str]
+    PROFILE_URL_PREFIX: ClassVar[str]
     profile_url: str
     keys: Keys
 
@@ -52,7 +55,7 @@ class AgentProfile(Profile):
 class NostrProfile(Profile):
     public_key: PublicKey
     profile_url: str
-    WEB_URL: ClassVar[str]
+    PROFILE_URL_PREFIX: ClassVar[str]
     locations: Set[str]
 
     def __init__(self, public_key: PublicKey) -> None: ...

{agentstr-0.1.14 → agentstr-0.1.16}/src/agentstr/nostr.py

@@ -144,14 +144,23 @@ class NostrClient:
         except Exception as e:
             raise RuntimeError(f"Failed to publish product: {e}") from e
 
-    def publish_profile(self, name: str, about: str, picture: str) -> EventId:
+    def publish_profile(
+        self,
+        name: str,
+        about: str,
+        picture: str,
+        banner: str,
+        website: Optional[str] = None,
+    ) -> EventId:
         """
         Publish a Nostr profile with event kind 0
 
         Args:
             name: name of the Nostr profile
             about: brief description about the profile
-            picture: url to a png file with a picture for the profile
+            picture: url to a file with a picture for the profile
+            banner: url to a file with a banner for the profile
+            website: optional url to a website for the profile
 
         Returns:
             EventId: event id if successful
@@ -160,7 +169,9 @@ class NostrClient:
             RuntimeError: if the profile can't be published
         """
         # Run the async publishing function synchronously
-        return asyncio.run(self._async_publish_profile(name, about, picture))
+        return asyncio.run(
+            self._async_publish_profile(name, about, picture, banner, website)
+        )
 
     def publish_stall(self, stall: MerchantStall) -> EventId:
         """Publish a stall to nostr
@@ -179,6 +190,41 @@ class NostrClient:
         except Exception as e:
             raise RuntimeError(f"Failed to publish stall: {e}") from e
 
+    def retrieve_marketplace(self, owner: PublicKey, name: str) -> set[NostrProfile]:
+        """
+        Retrieve all sellers from the marketplace.
+
+        Args:
+            owner: PublicKey of the owner of the marketplace
+            name: name of the marketplace
+
+        Returns:
+            set[NostrProfile]: set of seller profiles.
+            (skips authors with missing metadata)
+        """
+        events_filter = Filter().kind(Kind(30019)).authors([owner])
+        try:
+            events = asyncio.run(self._async_retrieve_events(events_filter))
+        except Exception as e:
+            raise RuntimeError(f"Failed to retrieve marketplace: {e}") from e
+
+        events_list = events.to_vec()
+        merchants_dict: Dict[PublicKey, NostrProfile] = {}
+
+        for event in events_list:
+            content = json.loads(event.content())
+            if content.get("name") == name:
+                merchants = content.get("merchants", [])
+                for merchant in merchants:
+                    try:
+                        public_key = PublicKey.parse(merchant)
+                        profile = asyncio.run(self._async_retrieve_profile(public_key))
+                        merchants_dict[public_key] = profile
+                    except RuntimeError:
+                        continue
+
+        return set(merchants_dict.values())
+
     def retrieve_products_from_seller(self, seller: PublicKey) -> List[MerchantProduct]:
         """
         Retrieve all products from a given seller.
@@ -451,7 +497,12 @@ class NostrClient:
         return await self._async_publish_event(good_event_builder)
 
     async def _async_publish_profile(
-        self, name: str, about: str, picture: str
+        self,
+        name: str,
+        about: str,
+        picture: str,
+        banner: str,
+        website: Optional[str] = None,
     ) -> EventId:
         """
         Asynchronous function to publish a Nostr profile with event kind 0
@@ -459,7 +510,9 @@ class NostrClient:
         Args:
             name: name of the Nostr profile
             about: brief description about the profile
-            picture: url to a png file with a picture for the profile
+            picture: url to a file with a picture for the profile
+            banner: url to a file with a banner for the profile
+            website: optional url to a website for the profile
 
         Returns:
             EventId: event id if successful
@@ -469,8 +522,13 @@ class NostrClient:
         """
         metadata_content = Metadata().set_name(name)
         metadata_content = metadata_content.set_about(about)
+        print(f"Banner: {banner}")
+        metadata_content = metadata_content.set_banner(banner)
         metadata_content = metadata_content.set_picture(picture)
 
+        if website:
+            metadata_content = metadata_content.set_website(website)
+
         event_builder = EventBuilder.metadata(metadata_content)
         return await self._async_publish_event(event_builder)
 
@@ -529,6 +587,23 @@ class NostrClient:
         except Exception as e:
             raise RuntimeError(f"Unable to retrieve stalls: {e}") from e
 
+    async def _async_retrieve_events(self, events_filter: Filter) -> Events:
+        """
+        Asynchronous function to retrieve events from the relay
+        """
+        try:
+            await self._async_connect()
+        except Exception as e:
+            raise RuntimeError("Unable to connect to the relay") from e
+
+        try:
+            events = await self.client.fetch_events_from(
+                urls=[self.relay], filter=events_filter, timeout=timedelta(seconds=2)
+            )
+            return events
+        except Exception as e:
+            raise RuntimeError(f"Unable to retrieve stalls: {e}") from e
+
     async def _async_retrieve_products_from_seller(self, seller: PublicKey) -> Events:
         """
         Asynchronous function to retrieve the products for a given author

{agentstr-0.1.14 → agentstr-0.1.16}/src/agentstr/nostr.pyi

@@ -18,6 +18,7 @@ from nostr_sdk import (  # type: ignore
     EventBuilder,
     EventId,
     Events,
+    Filter,
     Keys,
     Kind,
     Metadata,
@@ -68,8 +69,18 @@ class NostrClient:
     def publish_event(self, event_builder: EventBuilder) -> EventId: ...
     def publish_note(self, text: str) -> EventId: ...
     def publish_product(self, product: MerchantProduct) -> EventId: ...
-    def publish_profile(self, name: str, about: str, picture: str) -> EventId: ...
+    def publish_profile(
+        self,
+        name: str,
+        about: str,
+        picture: str,
+        banner: str,
+        website: Optional[str] = None,
+    ) -> EventId: ...
     def publish_stall(self, stall: MerchantStall) -> EventId: ...
+    def retrieve_marketplace(
+        self, owner: PublicKey, name: str
+    ) -> set[NostrProfile]: ...
     def retrieve_products_from_seller(
         self, seller: PublicKey
     ) -> List[MerchantProduct]: ...
@@ -83,10 +94,16 @@ class NostrClient:
     async def _async_publish_note(self, text: str) -> EventId: ...
     async def _async_publish_product(self, product: MerchantProduct) -> EventId: ...
     async def _async_publish_profile(
-        self, name: str, about: str, picture: str
+        self,
+        name: str,
+        about: str,
+        picture: str,
+        banner: str,
+        website: Optional[str] = None,
     ) -> EventId: ...
     async def _async_publish_stall(self, stall: MerchantStall) -> EventId: ...
     async def _async_retrieve_all_stalls(self) -> Events: ...
+    async def _async_retrieve_events(self, events_filter: Filter) -> Events: ...
     async def _async_retrieve_products_from_seller(
         self, seller: PublicKey
     ) -> Events: ...

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: agentstr
-Version: 0.1.14
+Version: 0.1.16
 Summary: Tools for a Nostr agentic ecosystem
 Author-email: Synvya <synvya@synvya.com>
 License: MIT
@@ -8,7 +8,7 @@ Project-URL: Homepage, https://www.synvya.com
 Project-URL: Repository, https://github.com/synvya/agentstr
 Project-URL: Documentation, https://github.com/synvya/agentstr#readme
 Project-URL: BugTracker, https://github.com/synvya/agentstr/issues
-Requires-Python: <3.13,>=3.9
+Requires-Python: <3.13,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: agno>=1.1.1
@@ -24,8 +24,10 @@ Requires-Dist: mypy>=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: psycopg[binary]>=3.2.5; extra == "examples"
+Requires-Dist: sqlalchemy>=2.0.0; extra == "examples"
+Requires-Dist: nest-asyncio>=1.6.0; extra == "examples"
+Requires-Dist: pgvector>=0.3.6; extra == "examples"
 Requires-Dist: fastapi>=0.110.0; extra == "examples"
 Requires-Dist: uvicorn>=0.30.0; extra == "examples"
 
@@ -126,7 +128,3 @@ This project is licensed under the MIT License - see the [LICENSE](https://githu
 - [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.14 → agentstr-0.1.16}/src/agentstr.egg-info/SOURCES.txt

@@ -16,8 +16,4 @@ src/agentstr.egg-info/PKG-INFO
 src/agentstr.egg-info/SOURCES.txt
 src/agentstr.egg-info/dependency_links.txt
 src/agentstr.egg-info/requires.txt
-src/agentstr.egg-info/top_level.txt
-tests/test_buyer.py
-tests/test_merchant.py
-tests/test_nostr_integration.py
-tests/test_nostr_mocked.py
+src/agentstr.egg-info/top_level.txt

{agentstr-0.1.14 → agentstr-0.1.16}/src/agentstr.egg-info/requires.txt

@@ -13,7 +13,9 @@ pylint>=3.0
 
 [examples]
 python-dotenv>=1.0
-cassandra-driver>=3.29.2
-cassio>=0.1.10
+psycopg[binary]>=3.2.5
+sqlalchemy>=2.0.0
+nest-asyncio>=1.6.0
+pgvector>=0.3.6
 fastapi>=0.110.0
 uvicorn>=0.30.0

agentstr-0.1.14/MANIFEST.in

@@ -1,3 +0,0 @@
-include LICENSE README.md
-global-exclude __pycache__
-global-exclude *.py[cod]

agentstr-0.1.14/tests/test_buyer.py

@@ -1,110 +0,0 @@
-"""
-This module contains tests for the BuyerTools class.
-"""
-
-import json
-from typing import List
-from unittest.mock import patch
-
-from agentstr.buyer import BuyerTools
-from agentstr.models import AgentProfile, MerchantProduct, MerchantStall, NostrProfile
-from agentstr.nostr import Keys, PublicKey
-
-
-def test_buyer_profile_creation(
-    buyer_profile: AgentProfile,
-    buyer_profile_name: str,
-    buyer_profile_about: str,
-    buyer_profile_picture: str,
-) -> None:
-    """Test the creation of a buyer profile"""
-    assert buyer_profile.get_name() == buyer_profile_name
-    assert buyer_profile.get_about() == buyer_profile_about
-    assert buyer_profile.get_picture() == buyer_profile_picture
-
-
-def test_find_sellers_by_location(
-    buyer_tools: BuyerTools, merchant_location: str, merchant_profile_name: str
-) -> None:
-    """Test the finding of sellers by location"""
-    with patch(
-        "agentstr.buyer._map_location_to_geohash"
-    ) as mock_map_location_to_geohash:
-        mock_map_location_to_geohash.return_value = "000000000"
-
-        result = buyer_tools.find_sellers_by_location(merchant_location)
-        assert result is not None
-        assert merchant_profile_name in result
-
-
-def test_find_seller_by_name(
-    buyer_tools: BuyerTools,
-    merchant_profile_name: str,
-) -> None:
-    """Test the finding of a seller by name"""
-    result = buyer_tools.find_seller_by_name(merchant_profile_name)
-    assert result is not None
-    assert merchant_profile_name in result
-
-
-def test_find_seller_by_public_key(
-    buyer_tools: BuyerTools,
-    merchant_keys: Keys,
-    seller_nostr_profile: NostrProfile,
-) -> None:
-    """Test the finding of a seller by public key"""
-    with patch.object(
-        buyer_tools, "find_seller_by_public_key"
-    ) as mock_find_seller_by_public_key:
-        mock_find_seller_by_public_key.return_value = seller_nostr_profile.to_json()
-
-        result = buyer_tools.find_seller_by_public_key(
-            merchant_keys.public_key().to_bech32()
-        )
-        assert result is not None
-        assert merchant_keys.public_key().to_bech32() in result
-
-
-def test_get_seller_stalls(
-    buyer_tools: BuyerTools,
-    seller_nostr_profile: NostrProfile,
-    merchant_stalls: List[MerchantStall],
-) -> None:
-    """Test the retrieval of a seller's stalls"""
-    with patch.object(
-        buyer_tools.get_nostr_client(), "retrieve_stalls_from_seller"
-    ) as mock_get_seller_stalls:
-        stall_data = [
-            merchant_stall.to_stall_data() for merchant_stall in merchant_stalls
-        ]
-        mock_get_seller_stalls.return_value = stall_data
-
-        result = buyer_tools.get_seller_stalls(seller_nostr_profile.get_public_key())
-        assert result is not None
-
-
-def test_get_seller_products(
-    buyer_tools: BuyerTools,
-    seller_nostr_profile: NostrProfile,
-    merchant_products: List[MerchantProduct],
-) -> None:
-    """Test the retrieval of a seller's products"""
-    with patch.object(
-        buyer_tools.get_nostr_client(),
-        "retrieve_products_from_seller",
-        return_value=merchant_products,
-    ) as mock_get_seller_products:
-        result = buyer_tools.get_seller_products(seller_nostr_profile.get_public_key())
-        assert isinstance(result, str)  # Ensure it's a JSON string
-
-        # ✅ Verify that the mocked method was called
-        mock_get_seller_products.assert_called_once_with(
-            PublicKey.parse(seller_nostr_profile.get_public_key())
-        )
-
-        products = json.loads(result)  # Convert JSON string back to a Python list
-        products = json.loads(result)  # Convert JSON string back to a Python list
-        assert isinstance(products, list)  # Ensure it's a list
-        assert len(products) > 0  # Ensure the list is not empty
-        assert isinstance(products[0], dict)  # Ensure the first item is a dictionary
-        assert "name" in products[0]  # Ensure "name" key exists in the first product

agentstr-0.1.14/tests/test_merchant.py

@@ -1,154 +0,0 @@
-"""
-This module contains tests for the MerchantTools class.
-"""
-
-import itertools
-import json
-from typing import List
-from unittest.mock import patch
-
-from agentstr.merchant import MerchantTools
-from agentstr.models import MerchantProduct, MerchantStall
-from agentstr.nostr import EventId
-
-
-def test_merchant_initialization(
-    relay: str,
-    merchant_tools: MerchantTools,
-    merchant_stalls: List[MerchantStall],
-    merchant_products: List[MerchantProduct],
-) -> None:
-    """Test merchant initialization"""
-    assert merchant_tools.get_profile() is not None
-    assert merchant_tools.get_relay() == relay
-
-    products = json.loads(merchant_tools.get_products())
-    assert len(products) == len(merchant_products)
-
-    stalls = json.loads(merchant_tools.get_stalls())
-    assert len(stalls) == len(merchant_stalls)
-    assert stalls[0]["name"] == merchant_stalls[0].name
-
-
-def test_publish_product_by_name(
-    merchant_tools: MerchantTools,
-    product_event_ids: List[EventId],
-    merchant_products: List[MerchantProduct],
-) -> None:
-    """Test publishing a product by name"""
-    with patch.object(
-        merchant_tools.get_nostr_client(), "publish_product"
-    ) as mock_publish:
-        mock_publish.return_value = product_event_ids[0]
-
-        result = json.loads(
-            merchant_tools.publish_product_by_name(merchant_products[0].name)
-        )
-        assert result["status"] == "success"
-        assert result["product_name"] == merchant_products[0].name
-
-        result = json.loads(
-            merchant_tools.publish_product_by_name(
-                json.dumps({"name": merchant_products[0].name})
-            )
-        )
-        assert result["status"] == "success"
-        assert result["product_name"] == merchant_products[0].name
-
-
-def test_publish_stall_by_name(
-    merchant_tools: MerchantTools,
-    stall_event_ids: List[EventId],
-    merchant_stalls: List[MerchantStall],
-) -> None:
-    """Test publishing a stall by name"""
-    with patch.object(
-        merchant_tools.get_nostr_client(), "publish_stall"
-    ) as mock_publish:
-        mock_publish.return_value = stall_event_ids[0]
-
-        result = json.loads(
-            merchant_tools.publish_stall_by_name(merchant_stalls[0].name)
-        )
-        assert result["status"] == "success"
-        assert result["stall_name"] == merchant_stalls[0].name
-
-
-def test_publish_products_by_stall_name(
-    merchant_tools: MerchantTools,
-    product_event_ids: List[EventId],
-    merchant_stalls: List[MerchantStall],
-) -> None:
-    """Test publishing all products in a stall"""
-    with patch.object(
-        merchant_tools.get_nostr_client(), "publish_product"
-    ) as mock_publish:
-        mock_publish.side_effect = itertools.cycle(product_event_ids)
-
-        results = json.loads(
-            merchant_tools.publish_products_by_stall_name(merchant_stalls[0].name)
-        )
-        assert len(results) == 2
-        assert all(r["status"] == "success" for r in results)
-
-
-def test_publish_all_products(
-    merchant_tools: MerchantTools, product_event_ids: List[EventId]
-) -> None:
-    """Test publishing all products"""
-    with patch.object(
-        merchant_tools.get_nostr_client(), "publish_product"
-    ) as mock_publish:
-        mock_publish.side_effect = itertools.cycle(product_event_ids)
-
-        results = json.loads(merchant_tools.publish_all_products())
-        assert len(results) == 3
-
-
-def test_publish_all_stalls(
-    merchant_tools: MerchantTools, stall_event_ids: List[EventId]
-) -> None:
-    """Test publishing all stalls"""
-    with patch.object(
-        merchant_tools.get_nostr_client(), "publish_stall"
-    ) as mock_publish:
-        mock_publish.side_effect = itertools.cycle(stall_event_ids)
-
-        results = json.loads(merchant_tools.publish_all_stalls())
-        assert len(results) == 2
-
-
-def test_error_handling(merchant_tools: MerchantTools) -> None:
-    """Test error handling in various scenarios"""
-    result = json.loads(merchant_tools.publish_product_by_name("NonExistentProduct"))
-    assert result["status"] == "error"
-
-    results = json.loads(merchant_tools.publish_stall_by_name("NonExistentStall"))
-    assert isinstance(results, list)
-    assert results[0]["status"] == "error"
-
-    results = json.loads(
-        merchant_tools.publish_products_by_stall_name("NonExistentStall")
-    )
-    assert isinstance(results, list)
-    assert results[0]["status"] == "error"
-
-
-def test_profile_operations(
-    merchant_tools: MerchantTools,
-    profile_event_id: EventId,
-    merchant_profile_name: str,
-    merchant_profile_about: str,
-) -> None:
-    """Test profile-related operations"""
-    profile_data = json.loads(merchant_tools.get_profile())
-    profile = json.loads(profile_data)  # Parse the nested JSON string
-    assert profile["name"] == merchant_profile_name
-    assert profile["about"] == merchant_profile_about
-
-    with patch.object(
-        merchant_tools.get_nostr_client(), "publish_profile"
-    ) as mock_publish:
-        mock_publish.return_value = profile_event_id
-        result = json.loads(merchant_tools.publish_profile())
-        assert isinstance(result, dict)

agentstr-0.1.14/tests/test_nostr_integration.py

@@ -1,98 +0,0 @@
-"""
-This module contains tests for the NostrClient class using a real Nostr relay.
-"""
-
-from typing import List
-
-import pytest
-
-from agentstr.models import MerchantProduct, MerchantStall
-from agentstr.nostr import EventId, Keys, NostrClient
-
-
-# used in test_nostr_integration.py
-@pytest.fixture(scope="session", name="nostr_client")
-def nostr_client_fixture(relay: str, merchant_keys: Keys) -> NostrClient:
-    """Fixture providing a NostrClient instance"""
-    nostr_client = NostrClient(relay, merchant_keys.secret_key().to_bech32())
-    return nostr_client
-
-
-class TestNostrClient:
-    """Test suite for NostrClient"""
-
-    def test_publish_profile(
-        self,
-        nostr_client: NostrClient,
-        merchant_profile_name: str,
-        merchant_profile_about: str,
-        merchant_profile_picture: str,
-    ) -> None:
-        """Test publishing a profile"""
-        event_id = nostr_client.publish_profile(
-            name=merchant_profile_name,
-            about=merchant_profile_about,
-            picture=merchant_profile_picture,
-        )
-        assert isinstance(event_id, EventId)
-
-    def test_publish_stall(
-        self, nostr_client: NostrClient, merchant_stalls: List[MerchantStall]
-    ) -> None:
-        """Test publishing a stall"""
-        event_id = nostr_client.publish_stall(merchant_stalls[0])
-        assert isinstance(event_id, EventId)
-
-    def test_publish_product(
-        self, nostr_client: NostrClient, merchant_products: List[MerchantProduct]
-    ) -> None:
-        """Test publishing a product"""
-        event_id = nostr_client.publish_product(merchant_products[0])
-        assert isinstance(event_id, EventId)
-
-    # def test_delete_event(
-    #     self, nostr_client: NostrClient, test_merchant_stall: MerchantStall
-    # ) -> None:
-    #     """Test deleting an event"""
-    #     # First publish something to delete
-    #     event_id = nostr_client.publish_stall(test_merchant_stall)
-    #     assert isinstance(event_id, EventId)
-
-    #     # Then delete it
-    #     delete_event_id = nostr_client.delete_event(event_id, reason="Test deletion")
-    #     assert isinstance(delete_event_id, EventId)
-
-    def test_retrieve_products_from_seller(
-        self, nostr_client: NostrClient, merchant_keys: Keys
-    ) -> None:
-        """Test retrieving products from a seller"""
-        products = nostr_client.retrieve_products_from_seller(
-            merchant_keys.public_key()
-        )
-        assert len(products) > 0
-        for product in products:
-            assert isinstance(product, MerchantProduct)
-            # print(f"Product: {product.name}")
-
-    def test_retrieve_sellers(self, nostr_client: NostrClient) -> None:
-        """Test retrieving sellers"""
-        try:
-            sellers = nostr_client.retrieve_sellers()
-            assert len(sellers) > 0
-        except RuntimeError as e:
-            # print(f"\nError retrieving sellers: {e}")
-            raise e
-
-    def test_retrieve_stalls_from_seller(
-        self, nostr_client: NostrClient, merchant_keys: Keys
-    ) -> None:
-        """Test retrieving stalls from a seller"""
-        stalls = nostr_client.retrieve_stalls_from_seller(merchant_keys.public_key())
-        assert len(stalls) > 0
-
-    def test_retrieve_profile(
-        self, nostr_client: NostrClient, merchant_keys: Keys
-    ) -> None:
-        """Test async retrieve profile"""
-        profile = nostr_client.retrieve_profile(merchant_keys.public_key())
-        assert profile is not None

agentstr-0.1.14/tests/test_nostr_mocked.py

@@ -1,107 +0,0 @@
-"""
-Module to perform mocked tests on the NostrClient class.
-Used for regular CI/CD testing without connecting to a real Nostr relay.
-"""
-
-from typing import Generator, List
-from unittest.mock import patch
-
-import pytest
-
-from agentstr.models import AgentProfile, MerchantProduct, MerchantStall
-from agentstr.nostr import EventId, Keys, NostrClient
-
-
-# used in test_nostr_mocked.py
-@pytest.fixture(name="nostr_client")
-def mock_nostr_client(  # type: ignore[no-untyped-def]
-    profile_event_id: EventId,
-    stall_event_ids: List[EventId],
-    product_event_ids: List[EventId],
-    merchant_products: List[MerchantProduct],
-    merchant_stalls: List[MerchantStall],
-    merchant_profile: AgentProfile,
-) -> Generator[NostrClient, None, None]:
-    """
-    mock NostrClient instance
-    """
-    with patch("agentstr.nostr.NostrClient") as mock_client:
-        instance = mock_client.return_value
-        # mock_event_id = EventId(
-        #     public_key=Keys.generate().public_key(),
-        #     created_at=Timestamp.from_secs(1739580690),
-        #     kind=Kind(0),
-        #     tags=[],
-        #     content="mock_content",
-        # )
-        instance.publish_profile.return_value = profile_event_id
-        instance.publish_stall.return_value = stall_event_ids[0]
-        instance.publish_product.return_value = product_event_ids[0]
-        instance.retrieve_products_from_seller.return_value = merchant_products
-        instance.retrieve_sellers.return_value = [merchant_profile]
-        instance.retrieve_stalls_from_seller.return_value = merchant_stalls
-        instance.retrieve_profile.return_value = merchant_profile
-        yield instance
-
-
-class TestNostrClientMocked:
-    """Mocked test suite for NostrClient"""
-
-    def test_publish_profile(
-        self,
-        nostr_client: NostrClient,
-        merchant_profile_name: str,
-        merchant_profile_about: str,
-        merchant_profile_picture: str,
-    ) -> None:
-        """Test publishing a profile"""
-        event_id = nostr_client.publish_profile(
-            name=merchant_profile_name,
-            about=merchant_profile_about,
-            picture=merchant_profile_picture,
-        )
-        assert isinstance(event_id, EventId)
-
-    def test_publish_stall(
-        self, nostr_client: NostrClient, merchant_stalls: List[MerchantStall]
-    ) -> None:
-        """Test publishing a stall"""
-        event_id = nostr_client.publish_stall(merchant_stalls[0])
-        assert isinstance(event_id, EventId)
-
-    def test_publish_product(
-        self, nostr_client: NostrClient, merchant_products: List[MerchantProduct]
-    ) -> None:
-        """Test publishing a product"""
-        event_id = nostr_client.publish_product(merchant_products[0])
-        assert isinstance(event_id, EventId)
-
-    def test_retrieve_products_from_seller(
-        self, nostr_client: NostrClient, merchant_keys: Keys
-    ) -> None:
-        """Test retrieving products from a seller"""
-        products = nostr_client.retrieve_products_from_seller(
-            merchant_keys.public_key()
-        )
-        assert len(products) > 0
-        for product in products:
-            assert isinstance(product, MerchantProduct)
-
-    def test_retrieve_sellers(self, nostr_client: NostrClient) -> None:
-        """Test retrieving sellers"""
-        sellers = nostr_client.retrieve_sellers()
-        assert len(sellers) > 0
-
-    def test_retrieve_stalls_from_seller(
-        self, nostr_client: NostrClient, merchant_keys: Keys
-    ) -> None:
-        """Test retrieving stalls from a seller"""
-        stalls = nostr_client.retrieve_stalls_from_seller(merchant_keys.public_key())
-        assert len(stalls) > 0
-
-    def test_retrieve_profile(
-        self, nostr_client: NostrClient, merchant_keys: Keys
-    ) -> None:
-        """Test async retrieve profile"""
-        profile = nostr_client.retrieve_profile(merchant_keys.public_key())
-        assert profile is not None