mojentic 0.5.1__py3-none-any.whl → 0.5.3__py3-none-any.whl

_examples/broker_examples.py

@@ -1,4 +1,8 @@
+import logging
 import os
+
+logging.basicConfig(level=logging.WARN)
+
 from pathlib import Path
 
 from pydantic import BaseModel, Field
@@ -39,19 +43,34 @@ def check_tool_use(llm):
                           tools=[ResolveDateTool()])
     print(result)
 
-def check_image_analysis(llm):
+def check_image_analysis(llm, image_path: Path = None):
+    if image_path is None:
+        image_path = Path.cwd() / 'images' / 'flash_rom.jpg'
     result = llm.generate(messages=[
         (LLMMessage(content='What is in this image?',
-                    image_paths=[str(Path.cwd() / 'images' / 'flash_rom.jpg')]))
+                    image_paths=[str(image_path)]))
     ])
     print(result)
 
-check_simple_textgen(openai_llm())
-check_structured_output(openai_llm())
-check_tool_use(openai_llm())
-check_image_analysis(openai_llm())
+models = ["gpt-4o", "gpt-4.1", "o3", "gpt-4.5-preview", "o4-mini"]
+images = [
+    Path.cwd() / 'images' / 'flash_rom.jpg',
+    Path.cwd() / 'images' / 'screen_cap.png',
+    Path.cwd() / 'images' / 'xbox-one.jpg',
+]
+
+for image in images:
+    for model in models:
+        print(f"Checking {model} with {str(image)}")
+        check_image_analysis(openai_llm(model=model), image)
+
+
+# check_simple_textgen(openai_llm(model="o4-mini"))
+# check_structured_output(openai_llm(model="o4-mini"))
+# check_tool_use(openai_llm(model="o4-mini"))
+# check_image_analysis(openai_llm(model="gpt-4o"))
 
-check_simple_textgen(ollama_llm())
-check_structured_output(ollama_llm())
-check_tool_use(ollama_llm())
-check_image_analysis(ollama_llm(model="gemma3:27b"))
+# check_simple_textgen(ollama_llm())
+# check_structured_output(ollama_llm())
+# check_tool_use(ollama_llm())
+# check_image_analysis(ollama_llm(model="gemma3:27b"))

mojentic/llm/message_composers.py

@@ -253,7 +253,7 @@ class MessageBuilder():
 
         return self
 
-    def load_content(self, file_path: Union[str, Path], template_values: Optional[Dict[str, str]] = None) -> "MessageBuilder":
+    def load_content(self, file_path: Union[str, Path], template_values: Optional[Dict[str, Union[str, Path]]] = None) -> "MessageBuilder":
         """
         Load content from a file into the content field of the MessageBuilder.
 
@@ -265,11 +265,14 @@ class MessageBuilder():
         ----------
         file_path : Union[str, Path]
             Path to the file to load content from. Can be a string or Path object.
-        template_values : Optional[Dict[str, str]], optional
+        template_values : Optional[Dict[str, Union[str, Path]]], optional
             Dictionary of values used to replace placeholders in the content.
             For example, if the content contains "{greeting}" and template_values is
             {"greeting": "Hello, World!"}, then "{greeting}" will be replaced with
-            "Hello, World!". Default is None.
+            "Hello, World!".
+            If a value is a Path object, it will be treated as a file reference and the
+            content of that file will be used to replace the placeholder.
+            Default is None.
 
         Returns
         -------
@@ -290,7 +293,15 @@ class MessageBuilder():
         # Replace placeholders with template values if provided
         if template_values:
             for key, value in template_values.items():
-                self.content = self.content.replace(f"{{{key}}}", value)
+                if isinstance(value, Path):
+                    # If value is a Path, read the content of the file
+                    if not self.file_gateway.exists(value):
+                        raise FileNotFoundError(f"Template file not found: {value}")
+                    file_content = self.file_gateway.read(value).strip()
+                    self.content = self.content.replace(f"{{{key}}}", file_content)
+                else:
+                    # If value is a string, use it directly
+                    self.content = self.content.replace(f"{{{key}}}", value)
 
         return self
 
@@ -307,11 +318,14 @@ class MessageBuilder():
         LLMMessage
             An LLMMessage object containing the message content and image paths.
         """
+        parts = []
         if self.file_paths:
             file_contents = [self._file_content_partial(p) for p in self.file_paths]
-            self.content = "\n\n".join(file_contents)
+            parts.append("\n\n".join(file_contents))
+        if self.content is not None:
+            parts.append(self.content)
         return LLMMessage(
             role=self.role,
-            content=self.content,
+            content="\n\n".join(parts),
             image_paths=[str(p) for p in self.image_paths]
         )

mojentic/llm/tools/date_resolver.py

@@ -21,7 +21,8 @@ class ResolveDateTool(LLMTool):
 
         return {
             "relative_date": relative_date_found,
-            "resolved_date": resolved_date.strftime('%Y-%m-%d')
+            "resolved_date": resolved_date.strftime('%Y-%m-%d'),
+            "summary": f"The date on '{relative_date_found}' is {resolved_date.strftime('%Y-%m-%d')}"
         }
 
     @property
@@ -30,7 +31,7 @@ class ResolveDateTool(LLMTool):
             "type": "function",
             "function": {
                 "name": "resolve_date",
-                "description": "Take text that specifies a relative date, and output an absolute date. If no reference date is provided, the current date is used.",
+                "description": "Take text that specifies a relative date, and output an absolute date. If no reference date is available, the current date is used.",
                 "parameters": {
                     "type": "object",
                     "properties": {
@@ -41,7 +42,7 @@ class ResolveDateTool(LLMTool):
                         "reference_date_in_iso8601": {
                             "type": "string",
                             "description": "The date from which the resolved date should be calculated, in YYYY-MM-DD"
-                                           " format. If not provided, the current date is used."
+                                           " format. Do not provide if you weren't provided one, I will assume the current date."
                         }
                     },
                     "additionalProperties": False,

{mojentic-0.5.1.dist-info → mojentic-0.5.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mojentic
-Version: 0.5.1
+Version: 0.5.3
 Summary: Mojentic is an agentic framework that aims to provide a simple and flexible way to assemble teams of agents to solve complex problems.
 Author-email: Stacey Vetzal <stacey@vetzal.com>
 Project-URL: Homepage, https://github.com/mojility/mojentic

{mojentic-0.5.1.dist-info → mojentic-0.5.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 _examples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 _examples/broker_as_tool.py,sha256=axLrX9lzQAAxSTCmm1njvOk63EWfVRG3NU6pLiMyYH8,2962
-_examples/broker_examples.py,sha256=2KxHNgHR4or52OoiNOJFgXDOLaHOVgIkflQVkHbfabM,1698
+_examples/broker_examples.py,sha256=0byvkckM34pOnJhiddh7Rvfy2zRalBH6DT9ayUDT2OE,2292
 _examples/characterize_ollama.py,sha256=_TzPEAoTuB-saTiaypEQAsUpiBeM37l9I5wCMU3GM4E,2521
 _examples/characterize_openai.py,sha256=JQQNjsHIEegjLAS3uzDmq_Ci_ZqXTqjcoVaC-rS_R_8,564
 _examples/chat_session.py,sha256=7mLpH4IGQUgyyiY-fYbikDEiR5vEH-V5Z1qtB50d_qg,288
@@ -59,7 +59,7 @@ mojentic/llm/chat_session.py,sha256=H2gY0mZYVym8jC69VHsmKaRZ9T87Suyw0-TW5r850nA,
 mojentic/llm/chat_session_spec.py,sha256=8-jj-EHV2WwWuvo3t8I75kSEAYiG1nR-OEwkkLTi_z0,3872
 mojentic/llm/llm_broker.py,sha256=8dEgqU-cPesPk4-jx36oPnvKxB34bLONbpyAW_2L-es,5884
 mojentic/llm/llm_broker_spec.py,sha256=zxOf3n8lXmUsowzlMcC-fRcOj_6wwDf7xIqLIV278nM,6979
-mojentic/llm/message_composers.py,sha256=IrTK6HrwAQtJRMW5spMRZmX4yKHl2SJdOkFYvhVXZYg,11305
+mojentic/llm/message_composers.py,sha256=Fo9o7UGZOOIYoGI_DyOfP_oMiEiCMQz-zdWdTKtozVk,12108
 mojentic/llm/message_composers_spec.py,sha256=IXZ-Gl--1MGbmRkFNxucWTE7OZgLQHDDgw1WqMiZnF0,14762
 mojentic/llm/gateways/__init__.py,sha256=u7hXzngoRw_qbsJeiCH2NQ8vC2hF5DnqcXsfLVVPSSw,104
 mojentic/llm/gateways/anthropic.py,sha256=SsyNjq9QaXaqiMM43C9fwLp57hpgFtwNPJUnOAYVrtc,1788
@@ -82,7 +82,7 @@ mojentic/llm/registry/populate_registry_from_ollama.py,sha256=YFlnyXW-Htveu8frPE
 mojentic/llm/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mojentic/llm/tools/ask_user_tool.py,sha256=WrI3uTzIEmr_S5Pl-rmvh2f3O2IIFYfnJ5zeel_59ck,972
 mojentic/llm/tools/current_datetime.py,sha256=JkIFlBBnvE4CMcgZizqITVTtNfL7zeeLxD54E7oMeC8,1585
-mojentic/llm/tools/date_resolver.py,sha256=Vs8kmAONKif03YcVMZ3TqkKyOJZiy1yEAOqjTcvJFA8,2048
+mojentic/llm/tools/date_resolver.py,sha256=VDxX59PTHo0PstDxaJUo3SF7vkvQoG92bo6j8ABq8y4,2185
 mojentic/llm/tools/date_resolver_spec.py,sha256=OaRvJyhSN8sgi75euk4E5ImaqUmvQdgZKY8u_NOiPWE,1185
 mojentic/llm/tools/file_manager.py,sha256=X8Uw4XtdH_Ol2EB3SN11-GYlC1diJ1cAywU9_EuCjCg,3788
 mojentic/llm/tools/llm_tool.py,sha256=wU1DNf9DpMtcHhP-YC6_NAn1Frel_Ota6yqgPK2Xsp4,407
@@ -91,8 +91,8 @@ mojentic/llm/tools/tool_wrapper_spec.py,sha256=LGqtre-g8SzOy3xtpbMdgTnw2EdYutmFO
 mojentic/llm/tools/web_search.py,sha256=L1accST2xMhGAkwHCLlIvKihTLiaYxl0NI6IqCJWGCw,1102
 mojentic/utils/__init__.py,sha256=lqECkkoFvHFttDnafRE1vvh0Dmna_lwupMToP5VvX5k,115
 mojentic/utils/formatting.py,sha256=bPrwwdluXdQ8TsFxfWtHNOeMWKNvAfABSoUnnA1g7c8,947
-mojentic-0.5.1.dist-info/licenses/LICENSE.md,sha256=txSgV8n5zY1W3NiF5HHsCwlaW0e8We1cSC6TuJUqxXA,1060
-mojentic-0.5.1.dist-info/METADATA,sha256=YIXg6guNrmTF3fBI225OEvBGuFro2uPOdmnGl5xi1Xc,4935
-mojentic-0.5.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-mojentic-0.5.1.dist-info/top_level.txt,sha256=Q-BvPQ8Eu1jnEqK8Xkr6A9C8Xa1z38oPZRHuA5MCTqg,19
-mojentic-0.5.1.dist-info/RECORD,,
+mojentic-0.5.3.dist-info/licenses/LICENSE.md,sha256=txSgV8n5zY1W3NiF5HHsCwlaW0e8We1cSC6TuJUqxXA,1060
+mojentic-0.5.3.dist-info/METADATA,sha256=0WlHklNeQXHa9joHQTemZmBVRYeI12UVTHjZ46Ao9c4,4935
+mojentic-0.5.3.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+mojentic-0.5.3.dist-info/top_level.txt,sha256=Q-BvPQ8Eu1jnEqK8Xkr6A9C8Xa1z38oPZRHuA5MCTqg,19
+mojentic-0.5.3.dist-info/RECORD,,

{mojentic-0.5.1.dist-info → mojentic-0.5.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any