swarmauri-standard 0.6.0.dev147__tar.gz → 0.6.0.dev149__tar.gz

{swarmauri_standard-0.6.0.dev147 → swarmauri_standard-0.6.0.dev149}/PKG-INFO

@@ -1,8 +1,7 @@
 Metadata-Version: 2.3
 Name: swarmauri-standard
-Version: 0.6.0.dev147
+Version: 0.6.0.dev149
 Summary: This repository includes standard components within the Swarmauri framework.
-Home-page: http://github.com/swarmauri/swarmauri-sdk
 License: Apache-2.0
 Author: Jacob Stewart
 Author-email: jacob@swarmauri.com
@@ -14,28 +13,19 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: full
 Provides-Extra: io
-Provides-Extra: ml-toolkits
 Provides-Extra: nlp
-Provides-Extra: nlp-tools
-Provides-Extra: visualization
 Requires-Dist: Pillow (>=8.0,<11.0)
 Requires-Dist: aiofiles (==24.1.0) ; extra == "io" or extra == "full"
-Requires-Dist: aiohttp (>=3.10.10,<4.0.0) ; extra == "io" or extra == "full"
-Requires-Dist: beautifulsoup4 (==04.12.3) ; extra == "nlp-tools" or extra == "full"
 Requires-Dist: httpx (>=0.27.0,<0.28.0)
 Requires-Dist: joblib (>=1.4.0,<2.0.0)
-Requires-Dist: matplotlib (>=3.9.2) ; extra == "visualization" or extra == "full"
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: pydantic (>=2.9.2,<3.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
-Requires-Dist: scikit-learn (>=1.4.2,<2.0.0) ; extra == "ml-toolkits" or extra == "full"
-Requires-Dist: scipy (>=1.7.0,<1.14.0)
-Requires-Dist: swarmauri_base (>=0.6.0.dev147,<0.7.0)
-Requires-Dist: swarmauri_core (>=0.6.0.dev147,<0.7.0)
+Requires-Dist: swarmauri_base (>=0.6.0.dev149,<0.7.0)
+Requires-Dist: swarmauri_core (>=0.6.0.dev149,<0.7.0)
 Requires-Dist: toml (>=0.10.2,<0.11.0)
 Requires-Dist: typing_extensions
-Requires-Dist: yake (==0.4.8) ; extra == "nlp" or extra == "full"
 Project-URL: Repository, http://github.com/swarmauri/swarmauri-sdk
 Description-Content-Type: text/markdown
 

{swarmauri_standard-0.6.0.dev147 → swarmauri_standard-0.6.0.dev149}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "swarmauri-standard"
-version = "0.6.0.dev147"
+version = "0.6.0.dev149"
 description = "This repository includes standard components within the Swarmauri framework."
 authors = ["Jacob Stewart <jacob@swarmauri.com>"]
 license = "Apache-2.0"
@@ -17,8 +17,8 @@ classifiers = [
 python = ">=3.10,<3.13"
 
 # Swarmauri
-swarmauri_core = { version = "^0.6.0.dev147" }
-swarmauri_base = { version = "^0.6.0.dev147" }
+swarmauri_core = { version = "^0.6.0.dev149" }
+swarmauri_base = { version = "^0.6.0.dev149" }
 
 # Dependencies
 toml = "^0.10.2"
@@ -37,7 +37,7 @@ Pillow = ">=8.0,<11.0"
 
 # Optional dependencies with versions specified
 aiofiles = { version = "24.1.0", optional = true }
-aiohttp = { version = "^3.10.10", optional = true }
+#aiohttp = { version = "^3.10.10", optional = true }
 #cohere = { version = "^5.11.0", optional = true }
 #mistralai = { version = "^1.2.1", optional = true }
 #fal-client = { version = ">=0.5.0", optional = true }
@@ -45,50 +45,54 @@ aiohttp = { version = "^3.10.10", optional = true }
 #openai = { version = "^1.52.0", optional = true }
 #nltk = { version = "^3.9.1", optional = true }
 #textblob = { version = "^0.18.0", optional = true }
-yake = { version = "==0.4.8", optional = true }
-beautifulsoup4 = { version = "04.12.3", optional = true }
+#yake = { version = "==0.4.8", optional = true }
+#beautifulsoup4 = { version = "04.12.3", optional = true }
 #gensim = { version = "==4.3.3", optional = true }
-scipy = { version = ">=1.7.0,<1.14.0", optional = true }
-scikit-learn = { version = "^1.4.2", optional = true }
+#scipy = { version = ">=1.7.0,<1.14.0", optional = true }
+#scikit-learn = { version = "^1.4.2", optional = true }
 #spacy = { version = ">=3.0.0,<=3.8.2", optional = true }
 #transformers = { version = "^4.45.0", optional = true }
 #torch = { version = "^2.5.0", optional = true }
 #keras = { version = ">=3.2.0", optional = true }
 #tf-keras = { version = ">=2.16.0", optional = true }
-matplotlib = { version = ">=3.9.2", optional = true }
+#matplotlib = { version = ">=3.9.2", optional = true }
 
 [tool.poetry.extras]
 # Extras without versioning, grouped for specific use cases
-io = ["aiofiles", "aiohttp"]
+io = [
+    "aiofiles",
+    #"aiohttp"
+]
 #llms = ["cohere", "mistralai", "fal-client", "google-generativeai", "openai"]
 nlp = [
     #"nltk", 
     #"textblob", 
-    "yake"
+    #"yake"
 ]
-nlp_tools = ["beautifulsoup4"]
+#nlp_tools = ["beautifulsoup4"]
 #ml_toolkits = ["gensim", "scipy", "scikit-learn"]
-ml_toolkits = ["scikit-learn"]
+#ml_toolkits = ["scikit-learn"]
 #spacy = ["spacy"]
 #transformers = ["transformers"]
 #torch = ["torch"]
 #tensorflow = ["keras", "tf-keras"]
-visualization = ["matplotlib"]
+#visualization = ["matplotlib"]
 
 # Full option to install all extras
 full = [
-    "aiofiles", "aiohttp",
+    "aiofiles", 
+    #"aiohttp",
     #"cohere", "mistralai", "fal-client", "google-generativeai", "openai",
     #"nltk", "textblob", 
-    "yake",
-    "beautifulsoup4",
-    "scikit-learn",
+    #"yake",
+    #"beautifulsoup4",
+    ##"scikit-learn",
     #"gensim", "scipy", "scikit-learn",
     #"spacy",
     #"transformers",
     #"torch",
     #"keras", "tf-keras",
-    "matplotlib"
+    #"matplotlib"
 ]
 
 [tool.poetry.group.dev.dependencies]

{swarmauri_standard-0.6.0.dev147 → swarmauri_standard-0.6.0.dev149}/swarmauri_standard/agents/QAAgent.py

@@ -5,11 +5,12 @@ from swarmauri_standard.messages.HumanMessage import HumanMessage
 
 from swarmauri_base.llms.LLMBase import LLMBase
 from swarmauri_base.agents.AgentBase import AgentBase
+from swarmauri_base.conversations.ConversationBase import ConversationBase
 from swarmauri_core.ComponentBase import SubclassUnion, ComponentBase
 
 @ComponentBase.register_type(AgentBase, 'QAAgent')
 class QAAgent(AgentBase):
-    conversation: MaxSystemContextConversation = MaxSystemContextConversation(max_size=2)
+    conversation: SubclassUnion[ConversationBase] = MaxSystemContextConversation(max_size=2)
     type: Literal['QAAgent'] = 'QAAgent'
 
     def exec(self, 

{swarmauri_standard-0.6.0.dev147 → swarmauri_standard-0.6.0.dev149}/swarmauri_standard/agents/RagAgent.py

@@ -30,7 +30,7 @@ class RagAgent(AgentRetrieveMixin,
     llm: SubclassUnion[LLMBase]
     conversation: Union[MaxSystemContextConversation, SessionCacheConversation] = MaxSystemContextConversation(system_context="")
     vector_store: SubclassUnion[VectorStoreBase]
-    system_context:  Union[SystemMessage, str]
+    system_context:  Union[SystemMessage, str] = SystemMessage(content="")
     type: Literal['RagAgent'] = 'RagAgent'
     
     def _create_preamble_context(self):

{swarmauri_standard-0.6.0.dev147 → swarmauri_standard-0.6.0.dev149}/swarmauri_standard/distances/CosineDistance.py

@@ -1,3 +1,4 @@
+import numpy as np
 from numpy.linalg import norm
 from typing import List, Literal
 from swarmauri_standard.vectors.Vector import Vector
@@ -13,7 +14,11 @@ class CosineDistance(DistanceBase):
     of these vectors.
     """
     type: Literal['CosineDistance'] = 'CosineDistance'   
-       
+
+    def dot_product(self, vector_a: Vector, vector_b: Vector) -> float:
+        """Compute the dot product of two vectors using their underlying values."""
+        return np.dot(vector_a.value, vector_b.value)
+
     def distance(self, vector_a: Vector, vector_b: Vector) -> float:
         """ 
         Computes the cosine distance between two vectors: 1 - cosine similarity.

{swarmauri_standard-0.6.0.dev147 → swarmauri_standard-0.6.0.dev149}/swarmauri_standard/image_gens/BlackForestImgGenModel.py

@@ -8,7 +8,8 @@ from swarmauri_standard.utils.retry_decorator import retry_on_status_codes
 from swarmauri_base.image_gens.ImageGenBase import ImageGenBase
 from swarmauri_core.ComponentBase import ComponentBase
 
-@ComponentBase.register_type(ImageGenBase, 'BlackForestImgGenModel')
+
+@ComponentBase.register_type(ImageGenBase, "BlackForestImgGenModel")
 class BlackForestImgGenModel(ImageGenBase):
     """
     A model for generating images using FluxPro's image generation models through the Black Forest API.

swarmauri_standard-0.6.0.dev149/swarmauri_standard/prompt_templates/PromptTemplate.py

@@ -0,0 +1,8 @@
+from typing import Literal
+from swarmauri_base.prompt_templates.PromptTemplateBase import PromptTemplateBase
+from swarmauri_core.ComponentBase import ComponentBase
+
+
+@ComponentBase.register_type(PromptTemplateBase, "PromptTemplate")
+class PromptTemplate(PromptTemplateBase):
+    type: Literal["PromptTemplate"] = "PromptTemplate"

{swarmauri_standard-0.6.0.dev147 → swarmauri_standard-0.6.0.dev149}/swarmauri_standard/tools/Parameter.py

@@ -1,6 +1,5 @@
 from typing import List, Literal, Union
 from swarmauri_base.tools.ParameterBase import ParameterBase
-from swarmauri_standard.tools.Parameter import Parameter
 from swarmauri_base.tools.ToolBase import ToolBase
 from swarmauri_core.ComponentBase import ComponentBase
 

swarmauri_standard-0.6.0.dev147/swarmauri_standard/prompts/PromptTemplate.py

@@ -1,7 +0,0 @@
-from typing import Literal
-from swarmauri_base.prompts.PromptTemplateBase import PromptTemplateBase
-from swarmauri_core.ComponentBase import ComponentBase
-
-@ComponentBase.register_type(PromptTemplateBase, 'PromptTemplate')
-class PromptTemplate(PromptTemplateBase):
-    type: Literal['PromptTemplate'] = 'PromptTemplate'