agently 4.0.6.4__py3-none-any.whl → 4.0.6.6__py3-none-any.whl

agently/builtins/plugins/PromptGenerator/AgentlyPromptGenerator.py

@@ -307,9 +307,7 @@ class AgentlyPromptGenerator(PromptGenerator):
         if isinstance(role_mapping, dict):
             merged_role_mapping.update(role_mapping)
 
-        prompt_text_list.append(
-            f"{ (merged_role_mapping['user'] if 'user' in merged_role_mapping else 'user').upper() }:"
-        )
+        prompt_text_list.append(f"{ (merged_role_mapping['user'] if 'user' in merged_role_mapping else 'user') }:")
 
         # system & developer
         if prompt_object.system:
@@ -368,7 +366,7 @@ class AgentlyPromptGenerator(PromptGenerator):
 
         prompt_text_list.extend(self._generate_main_prompt(prompt_object))
         prompt_text_list.append(
-            f"{ (merged_role_mapping['assistant'] if 'assistant' in merged_role_mapping else 'assistant').upper() }:"
+            f"{ (merged_role_mapping['assistant'] if 'assistant' in merged_role_mapping else 'assistant') }:"
         )
 
         return "\n".join(prompt_text_list)
@@ -398,12 +396,7 @@ class AgentlyPromptGenerator(PromptGenerator):
         if prompt_object.system:
             prompt_messages.append(
                 self._generate_yaml_prompt_message(
-                    str(
-                        prompt_title_mapping.get(
-                            'system',
-                            'SYSTEM',
-                        )
-                    ),
+                    "system",
                     prompt_object.system,
                     role_mapping=merged_role_mapping,
                 )
@@ -412,12 +405,7 @@ class AgentlyPromptGenerator(PromptGenerator):
         if prompt_object.developer:
             prompt_messages.append(
                 self._generate_yaml_prompt_message(
-                    str(
-                        prompt_title_mapping.get(
-                            'developer',
-                            'DEVELOPER DIRECTIONS',
-                        )
-                    ),
+                    "developer",
                     prompt_object.developer,
                     role_mapping=merged_role_mapping,
                 )

agently/integrations/chromadb.py

@@ -1,19 +1,31 @@
-from agently.utils import LazyImport
+from agently.utils import LazyImport, FunctionShifter
 
 LazyImport.import_package("chromadb")
 
-import json
+from typing import Callable, TypedDict, Any, TYPE_CHECKING
 
-from chromadb.api.types import EmbeddingFunction, Documents, Embedding, Embeddings
+from chromadb.api.types import EmbeddingFunction, DefaultEmbeddingFunction
 
-from typing import Callable, TypedDict, Any, cast
-from agently.core import BaseAgent
+if TYPE_CHECKING:
+    from chromadb.api.types import (
+        Documents,
+        Embedding,
+        Embeddings,
+        QueryResult,
+        Schema,
+        CollectionMetadata,
+        DataLoader,
+        Loadable,
+    )
+    from chromadb.api.collection_configuration import CreateCollectionConfiguration
+    from chromadb.api import ClientAPI
+    from agently.core import BaseAgent
 
 
 class ChromaDataDictOptional(TypedDict, total=False):
     metadata: dict[Any, Any]
     id: Any
-    embedding: Embedding
+    embedding: "Embedding"
 
 
 class ChromaDataDict(ChromaDataDictOptional):
@@ -25,15 +37,15 @@ class ChromaData:
         self,
         original_data: ChromaDataDict | list[ChromaDataDict],
         *,
-        embedding_function: Callable[[str | list[str]], Embeddings] | None = None,
-        agent: BaseAgent | None = None,
+        embedding_function: "Callable[[str | list[str]], Embeddings] | None" = None,
+        agent: "BaseAgent | None" = None,
     ):
         self._original_data = original_data if isinstance(original_data, list) else [original_data]
         if embedding_function:
             self._embedding_function = embedding_function
         elif agent:
 
-            def embedding_function_by_agent(texts: str | list[str]) -> Embeddings:
+            def embedding_function_by_agent(texts: str | list[str]) -> "Embeddings":
                 return agent.input(texts).start()
 
             self._embedding_function = embedding_function_by_agent
@@ -65,15 +77,50 @@ class ChromaData:
         return self._original_data
 
 
+class ChromaResults:
+    def __init__(
+        self,
+        *,
+        queries: str | list[str],
+        results: "QueryResult",
+    ):
+        if isinstance(queries, str):
+            queries = [queries]
+        if len(queries) != len(results["documents"] or []):
+            raise ValueError(
+                f"The length of queries does not equal the length of results.\nQueries: { queries }\nResults: { results }"
+            )
+        self._chroma_results = results
+        self._results = {}
+        for query_index, query in enumerate(queries):
+            for result_index, id in enumerate(results["ids"][query_index]):
+                result = {
+                    "id": id,
+                    "document": results["documents"][query_index][result_index] if results["documents"] else None,
+                    "metadata": results["metadatas"][query_index][result_index] if results["metadatas"] else None,
+                    "distance": results["distances"][query_index][result_index] if results["distances"] else None,
+                }
+                self._results[query] = result
+
+    def get_original_results(self):
+        return self._chroma_results
+
+    def get(self):
+        return self._results
+
+
 class ChromaEmbeddingFunction(EmbeddingFunction):
     def __init__(
-        self, *, embedding_function: Callable[[list[str]], Embeddings] | None = None, agent: BaseAgent | None = None
+        self,
+        *,
+        embedding_function: "Callable[[list[str]], Embeddings] | None" = None,
+        agent: "BaseAgent | None" = None,
     ):
         if embedding_function:
             self.embedding_function = embedding_function
         elif agent:
 
-            def embedding_function_by_agent(texts: list[str]) -> Embeddings:
+            def embedding_function_by_agent(texts: list[str]) -> "Embeddings":
                 return agent.input(texts).start()
 
             self.embedding_function = embedding_function_by_agent
@@ -82,5 +129,39 @@ class ChromaEmbeddingFunction(EmbeddingFunction):
                 f"ChromaEmbeddingFunction() requires at least one definition for 'embedding_function' or 'agent'."
             )
 
-    def __call__(self, documents: Documents) -> Embeddings:
+    def __call__(self, documents: "Documents") -> "Embeddings":
         return self.embedding_function([document for document in documents])
+
+
+class ChromaCollection:
+    def __init__(
+        self,
+        conn: "ClientAPI",
+        collection_name: str,
+        *,
+        schema: "Schema | None" = None,
+        configuration: "CreateCollectionConfiguration | None" = None,
+        metadata: None = None,
+        embedding_function: EmbeddingFunction | None = None,
+        agent: "BaseAgent | None" = None,
+        data_loader: "DataLoader[Loadable] | None" = None,
+        get_or_create: bool = False,
+    ):
+        if embedding_function:
+            self._embedding_function = embedding_function
+        elif agent:
+            self._embedding_function = ChromaEmbeddingFunction(agent=agent)
+        else:
+            self._embedding_function = DefaultEmbeddingFunction()
+
+        self._collection = conn.create_collection(
+            collection_name,
+            schema=schema,
+            configuration=configuration,
+            metadata=metadata,
+            embedding_function=embedding_function,
+            data_loader=data_loader,
+            get_or_create=get_or_create,
+        )
+
+    def add(self): ...

agently/types/data/tool.py

@@ -13,12 +13,12 @@
 # limitations under the License.
 
 
-from typing import Literal, Callable, TypeAlias
+from typing import Any, Literal, Callable, TypeAlias
 from typing_extensions import TypedDict, NotRequired
 from pydantic import AnyUrl
 from httpx import Auth, AsyncClient
 
-ArgumentDesc: TypeAlias = type | str | tuple[str | type, str]
+ArgumentDesc: TypeAlias = type | str | tuple[str | type | Any, str]
 KwargsType: TypeAlias = dict[str, ArgumentDesc]
 ReturnType: TypeAlias = KwargsType | ArgumentDesc | dict[str, "ReturnType"] | list["ReturnType"]
 

agently/utils/DataFormatter.py

@@ -218,21 +218,31 @@ class DataFormatter:
                 raise KeyError(f"Cannot find key 'type' in input schema: { input_schema }")
             if input_schema["type"] != "object":
                 raise TypeError(f"Input schema type is not 'object' but: { input_schema['type'] }")
-            if "properties" not in input_schema:
-                raise KeyError(f"Cannot find key 'properties' in input schema: { input_schema }")
-            properties = input_schema["properties"]
+
             kwargs_format: "KwargsType" = {}
-            for kwarg_name, kwarg_schema in properties.items():
-                if "type" in kwarg_schema:
-                    kwarg_type = kwarg_schema["type"]
-                    del kwarg_schema["type"]
+
+            if "properties" in input_schema and input_schema["properties"]:
+                properties = input_schema["properties"]
+                for kwarg_name, kwarg_schema in properties.items():
+                    kwarg_type = kwarg_schema.pop("type", Any)
+                    kwarg_schema.pop("title", None)
+                    kwarg_desc = ";".join([f"{k}: {v}" for k, v in kwarg_schema.items()]) if kwarg_schema else ""
+                    kwargs_format[kwarg_name] = (kwarg_type, kwarg_desc)
+
+            if "additionalProperties" in input_schema:
+                additional_properties = input_schema["additionalProperties"]
+                if additional_properties is True or additional_properties is None:
+                    kwargs_format["<*>"] = (Any, "")
                 else:
-                    kwarg_type = any
-                if "title" in kwarg_schema:
-                    del kwarg_schema["title"]
-                kwarg_desc = None
-                if kwarg_schema.keys():
-                    kwarg_desc = ";".join([f"{ key }: { value }" for key, value in kwarg_schema.items()])
-                kwargs_format.update({kwarg_name: (kwarg_type, kwarg_desc)})
-            return kwargs_format if len(kwargs_format.keys()) > 0 else None
+                    additional_type = additional_properties.pop("type", Any)
+                    additional_properties.pop("title", None)
+                    additional_desc = (
+                        ";".join([f"{k}: {v}" for k, v in additional_properties.items()])
+                        if additional_properties
+                        else ""
+                    )
+                    kwargs_format["<*>"] = (additional_type, additional_desc)
+
+            return kwargs_format or None
+
         return None

{agently-4.0.6.4.dist-info → agently-4.0.6.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agently
-Version: 4.0.6.4
+Version: 4.0.6.6
 Summary: 
 License: Apache-2.0
 License-File: LICENSE

{agently-4.0.6.4.dist-info → agently-4.0.6.6.dist-info}/RECORD

@@ -12,7 +12,7 @@ agently/builtins/hookers/ConsoleHooker.py,sha256=aJdDj_nG8CiwyelA505zvtpzBSwD52n
 agently/builtins/hookers/PureLoggerHooker.py,sha256=fzN0OfhQzgns4KeCNH-qcdm-BdQT0W2kqEmt3Zp2pYI,1906
 agently/builtins/hookers/SystemMessageHooker.py,sha256=nU5rOzcuXKdaTXWix3jhZ-4QoD4cMQJZo02wNTpZpjI,5396
 agently/builtins/plugins/ModelRequester/OpenAICompatible.py,sha256=ApH6EKAWY66eKpm-BtK6qID73CelLFA_7EfJ4zvRH1k,25233
-agently/builtins/plugins/PromptGenerator/AgentlyPromptGenerator.py,sha256=hUj3bkWLZvLmYwJoFpEfGjbF0VL-gKiHHoKoHFJgzvs,28906
+agently/builtins/plugins/PromptGenerator/AgentlyPromptGenerator.py,sha256=KMlXKH44MExTaGnu5cmLtvYT3aXOQiXOZN-F4JeVnJE,28514
 agently/builtins/plugins/ResponseParser/AgentlyResponseParser.py,sha256=FEhfsiHB4Bx7HfghnObklLj08j8IVwGh0WEVD6U-G3U,17445
 agently/builtins/plugins/ToolManager/AgentlyToolManager.py,sha256=oaqte5LAryZQMD6vuEbKhe6kOLUyZTRZswC1MDFiYxw,9138
 agently/builtins/plugins/__init__.py,sha256=wj4_U9TTekc2CmjppbXKUREDFRXFX1y0ySOW-CxQuok,801
@@ -37,7 +37,7 @@ agently/core/TriggerFlow/process/ForEachProcess.py,sha256=oBI7KIpnj2tbczt_cTJCNv
 agently/core/TriggerFlow/process/MatchCaseProcess.py,sha256=-NpbAlXq054juNkFCsDdWsIBMoHHKV1-cEsgndcd9KY,7888
 agently/core/TriggerFlow/process/__init__.py,sha256=BP5bAr9LRVVD83KFqXeprgTmXA1iCSOSsD509BtoX_E,753
 agently/core/__init__.py,sha256=CPglSpW5oEEmWpCpdvv9wK4myXmVipjuZm5HtMq6Vxo,1214
-agently/integrations/chromadb.py,sha256=2jkOPyKRR4hT7lwtMkaZq27wGL4wGmsRb2rpn7_2g3k,2995
+agently/integrations/chromadb.py,sha256=Hsp2cNZ_D3WK_OkYwlYBRvYpwBEgFGf7PuQW-ckUWwA,5693
 agently/types/__init__.py,sha256=xb8GMY-ULncO_PY9rfRUsyi12wAQQJx8gAAnoM30uZA,592
 agently/types/data/__init__.py,sha256=qladqSEqcAUW_XzdTDl4cvaraq_DpANy3aZbIPxoygk,1627
 agently/types/data/event.py,sha256=LFQW7MN_QGOis3XV-8K6jNXWsLvT7tYxo4BZbUBCpfI,1790
@@ -45,7 +45,7 @@ agently/types/data/prompt.py,sha256=DiszVM_3OHe66waf-99mBH7bzRr0cpbCHSpDI-2EjPs,
 agently/types/data/request.py,sha256=Do-9g5QxZRMYjaoHCZYwHbj28r-t4noAAtOebw764P4,1924
 agently/types/data/response.py,sha256=vjKIILaVyd5TVz5nvmytVRJPZg-RP0sRydhg_AzU6y0,3700
 agently/types/data/serializable.py,sha256=v2KlyKNOKp4L6J_Ueupb-gCyrnngvBskFUwNPSJQgnA,844
-agently/types/data/tool.py,sha256=wpNSyv_sCS8MWYcd6rewLDCleb3umpF7mf2hwtrm4_o,1518
+agently/types/data/tool.py,sha256=wE8Dda2JtY5cojpHUuQrw7PNeVZ6Zma968bn-pUmS7I,1529
 agently/types/plugins/EventHooker.py,sha256=kb80-baVc3fVlrddW5syv9uSD8a2Mcw8Fd3I2HQhY_Y,1030
 agently/types/plugins/ModelRequester.py,sha256=urG1zFX0b4U6ZKSO50IbW5IHK3ydmRgUom7O7Niqk8s,3875
 agently/types/plugins/PromptGenerator.py,sha256=45jmVzAkyl1Yj2M8RVfQM_zFAJZP4zrPuQkHbWIQSRQ,4531
@@ -55,7 +55,7 @@ agently/types/plugins/__init__.py,sha256=gz_EpgBQGndIQHY5vJB2YRzAN5yIb3FZZG7pC8l
 agently/types/plugins/base.py,sha256=AoNLwsH5IZBQt7_NZfxMWMhAk6PJSOFHR0IYOXp1imI,1167
 agently/types/trigger_flow/__init__.py,sha256=Gj31SmWBC4qtrOqQedyGsnCfeSkUf3XvZNFrJ2QbMNw,777
 agently/types/trigger_flow/trigger_flow.py,sha256=uDUZiila_4Rr41zUlzR4QqaRaraC43XTFfj-jnnG2G0,3787
-agently/utils/DataFormatter.py,sha256=Ni1aMmnc_6lDowTCSd3EVT-5i9DjbsWFex3EZS_14Vk,9044
+agently/utils/DataFormatter.py,sha256=0P92t81vnp-rJSJvlbTF3yM-PRiteB19BNEQ8cmvmns,9444
 agently/utils/DataLocator.py,sha256=ss8OLet9HN0U1PZb-OCHS6KL54kv7vFZph6G0-GBidk,6015
 agently/utils/DataPathBuilder.py,sha256=sEzE1i2EWn7NMkCCXDT50gR6_qMzcZ0y0YGkYbXdB3s,10007
 agently/utils/FunctionShifter.py,sha256=quwugTmf-vzHzRR_2wdv14AxLpr0lwxdUtVoX7Jeq48,5839
@@ -70,7 +70,7 @@ agently/utils/Storage.py,sha256=E7QyNJ9T0yOUafPgdP90La698hgLMSGjhJ7qCEHzxxw,9438
 agently/utils/StreamingJSONCompleter.py,sha256=aZ9zuGUTQlP-QKbXHUZCf6EtVuG49MKn8xdhw0VhDEA,4292
 agently/utils/StreamingJSONParser.py,sha256=sPPJOtj5OYvsrukRErcoxRl4yuV1zDuf7pQ_pvw_Zow,21116
 agently/utils/__init__.py,sha256=7MDln5OVkqFEdhhuG8VTdr2q02UWwCj-udndwzWV_iQ,1280
-agently-4.0.6.4.dist-info/METADATA,sha256=KqzCtQbUuUuuq6bDvLprqwHxzc96-W-WAbCx-83EpBU,7112
-agently-4.0.6.4.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-agently-4.0.6.4.dist-info/licenses/LICENSE,sha256=Y5ZgAdYgMFigPT8dhN18dTLRtBshOSfWhTDRO1t0Cq4,11360
-agently-4.0.6.4.dist-info/RECORD,,
+agently-4.0.6.6.dist-info/METADATA,sha256=wNMoonuHHBsLZHqe94S5YV6Cae2B_EvCzQS8FMbRiYU,7112
+agently-4.0.6.6.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+agently-4.0.6.6.dist-info/licenses/LICENSE,sha256=Y5ZgAdYgMFigPT8dhN18dTLRtBshOSfWhTDRO1t0Cq4,11360
+agently-4.0.6.6.dist-info/RECORD,,