mojentic 0.5.2__tar.gz → 0.5.4__tar.gz

{mojentic-0.5.2/src/mojentic.egg-info → mojentic-0.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mojentic
-Version: 0.5.2
+Version: 0.5.4
 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
@@ -13,6 +13,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: pydantic
 Requires-Dist: structlog
+Requires-Dist: numpy
 Requires-Dist: ollama
 Requires-Dist: openai
 Requires-Dist: anthropic

{mojentic-0.5.2 → mojentic-0.5.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mojentic"
-version = "0.5.2"
+version = "0.5.4"
 authors = [
     { name = "Stacey Vetzal", email = "stacey@vetzal.com" },
 ]
@@ -16,6 +16,7 @@ classifiers = [
 dependencies = [
     "pydantic",
     "structlog",
+    "numpy",
     "ollama",
     "openai",
     "anthropic",

{mojentic-0.5.2 → mojentic-0.5.4}/src/_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-0.5.4/src/_examples/oversized_embeddings.py

@@ -0,0 +1,9 @@
+import os
+
+from mojentic.llm.gateways import OllamaGateway, OpenAIGateway
+
+ollama = OllamaGateway()
+print(len(ollama.calculate_embeddings("Hello, world! " * 5000)))
+
+openai = OpenAIGateway(os.environ["OPENAI_API_KEY"])
+print(len(openai.calculate_embeddings("Hello, world! " * 5000)))

{mojentic-0.5.2 → mojentic-0.5.4}/src/mojentic/agents/iterative_problem_solver.py

@@ -26,7 +26,8 @@ class IterativeProblemSolver:
     max_iterations: int
     chat: ChatSession
 
-    def __init__(self, llm: LLMBroker, available_tools: Optional[List[LLMTool]] = None, max_iterations: int = 3):
+    def __init__(self, llm: LLMBroker, available_tools: Optional[List[LLMTool]] = None, max_iterations: int = 3,
+                 system_prompt: Optional[str] = None):
         """Initialize the IterativeProblemSolver.
 
         Parameters
@@ -42,7 +43,9 @@ class IterativeProblemSolver:
         self.available_tools = available_tools or []
         self.chat = ChatSession(
             llm=llm,
-            system_prompt="You are a helpful assistant, working on behalf of the user on a specific user request.",
+            system_prompt=system_prompt or "You are a problem-solving assistant that can solve complex problems step by step. "
+                                           "You analyze problems, break them down into smaller parts, and solve them systematically. "
+                                           "If you cannot solve a problem completely in one step, you make progress and identify what to do next.",
             tools=self.available_tools,
         )
 

{mojentic-0.5.2 → mojentic-0.5.4}/src/mojentic/agents/simple_recursive_agent.py

@@ -140,7 +140,7 @@ class SimpleRecursiveAgent:
     emitter: EventEmitter
     chat: ChatSession
 
-    def __init__(self, llm: LLMBroker, available_tools: Optional[List[LLMTool]] = None, max_iterations: int = 5):
+    def __init__(self, llm: LLMBroker, available_tools: Optional[List[LLMTool]] = None, max_iterations: int = 5, system_prompt: Optional[str] = None):
         """
         Initialize the SimpleRecursiveAgent.
 
@@ -161,7 +161,7 @@ class SimpleRecursiveAgent:
         # Initialize the chat session
         self.chat = ChatSession(
             llm=llm,
-            system_prompt="You are a problem-solving assistant that can solve complex problems step by step. "
+            system_prompt=system_prompt or "You are a problem-solving assistant that can solve complex problems step by step. "
                          "You analyze problems, break them down into smaller parts, and solve them systematically. "
                          "If you cannot solve a problem completely in one step, you make progress and identify what to do next.",
             tools=self.available_tools

{mojentic-0.5.2 → mojentic-0.5.4}/src/mojentic/llm/gateways/openai.py

@@ -1,12 +1,15 @@
 import json
-from typing import Type, List
+from itertools import islice
+from typing import Type, List, Iterable
 
+import numpy as np
 import structlog
 from openai import OpenAI
 
 from mojentic.llm.gateways.llm_gateway import LLMGateway
 from mojentic.llm.gateways.models import LLMToolCall, LLMGatewayResponse
 from mojentic.llm.gateways.openai_messages_adapter import adapt_messages_to_openai
+from mojentic.llm.gateways.tokenizer_gateway import TokenizerGateway
 
 logger = structlog.get_logger()
 
@@ -121,8 +124,28 @@ class OpenAIGateway(LLMGateway):
             The embeddings for the text.
         """
         logger.debug("calculate_embeddings", text=text, model=model)
-        response = self.client.embeddings.create(
-            model=model,
-            input=text
-        )
-        return response.data[0].embedding
+
+        embeddings = [self.client.embeddings.create(model=model, input=chunk).data[0].embedding
+                      for chunk in self._chunked_tokens(text, 8191)]
+        lengths = [len(embedding) for embedding in embeddings]
+
+        average = np.average(embeddings, axis=0, weights=lengths)
+        average = average / np.linalg.norm(average)
+        average = average.tolist()
+
+        return average
+
+    def _batched(self, iterable: Iterable, n: int):
+        """Batch data into tuples of length n. The last batch may be shorter."""
+        # batched('ABCDEFG', 3) --> ABC DEF G
+        if n < 1:
+            raise ValueError('n must be at least one')
+        it = iter(iterable)
+        while batch := tuple(islice(it, n)):
+            yield batch
+
+    def _chunked_tokens(self, text, chunk_length):
+        tokenizer = TokenizerGateway()
+        tokens = tokenizer.encode(text)
+        chunks_iterator = self._batched(tokens, chunk_length)
+        yield from chunks_iterator

{mojentic-0.5.2 → mojentic-0.5.4}/src/mojentic/llm/message_composers.py

@@ -318,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-0.5.2 → mojentic-0.5.4}/src/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.2 → mojentic-0.5.4/src/mojentic.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mojentic
-Version: 0.5.2
+Version: 0.5.4
 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
@@ -13,6 +13,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: pydantic
 Requires-Dist: structlog
+Requires-Dist: numpy
 Requires-Dist: ollama
 Requires-Dist: openai
 Requires-Dist: anthropic

{mojentic-0.5.2 → mojentic-0.5.4}/src/mojentic.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ src/_examples/image_broker.py
 src/_examples/image_broker_splat.py
 src/_examples/iterative_solver.py
 src/_examples/list_models.py
+src/_examples/oversized_embeddings.py
 src/_examples/raw.py
 src/_examples/react.py
 src/_examples/recursive_agent.py

{mojentic-0.5.2 → mojentic-0.5.4}/src/mojentic.egg-info/requires.txt

@@ -1,5 +1,6 @@
 pydantic
 structlog
+numpy
 ollama
 openai
 anthropic