mojentic 0.7.3__py3-none-any.whl → 0.7.4__py3-none-any.whl

_examples/model_characterization.py

@@ -0,0 +1,73 @@
+import os
+from mojentic.llm.gateways.openai import OpenAIGateway
+from mojentic.llm.gateways.models import LLMMessage, MessageRole
+
+def check_model_characterization():
+    """
+    Test the model characterization functionality with different OpenAI models.
+    This demonstrates how the gateway adapts parameters based on model type.
+    """
+    api_key = os.getenv("OPENAI_API_KEY")
+    if not api_key:
+        print("OPENAI_API_KEY environment variable not set. Skipping actual API calls.")
+        return
+
+    gateway = OpenAIGateway(api_key)
+
+    # Test messages for chat models
+    chat_messages = [
+        LLMMessage(role=MessageRole.System, content="You are a helpful assistant."),
+        LLMMessage(role=MessageRole.User, content="What is 2 + 2? Give a brief answer.")
+    ]
+
+    # Test messages for reasoning models (no system message supported)
+    reasoning_messages = [
+        LLMMessage(role=MessageRole.User, content="What is 2 + 2? Give a brief answer.")
+    ]
+
+    # Test with different model types
+    test_models = [
+        ("gpt-4o", "chat model"),
+        ("gpt-4o-mini", "chat model"),
+        ("o1-mini", "reasoning model"),
+        ("o1-preview", "reasoning model")
+    ]
+
+    print("Testing model characterization and parameter adaptation:")
+    print("=" * 60)
+
+    for model, model_type in test_models:
+        print(f"\nTesting {model} ({model_type}):")
+
+        # Test model classification
+        is_reasoning = gateway._is_reasoning_model(model)
+        print(f"  Classified as reasoning model: {is_reasoning}")
+
+        # Use appropriate messages based on model type
+        messages = reasoning_messages if gateway._is_reasoning_model(model) else chat_messages
+
+        # Test parameter adaptation
+        original_args = {
+            'model': model,
+            'messages': messages,
+            'max_tokens': 100
+        }
+
+        adapted_args = gateway._adapt_parameters_for_model(model, original_args)
+
+        if 'max_tokens' in adapted_args:
+            print(f"  Using parameter: max_tokens = {adapted_args['max_tokens']}")
+        elif 'max_completion_tokens' in adapted_args:
+            print(f"  Using parameter: max_completion_tokens = {adapted_args['max_completion_tokens']}")
+
+        try:
+            response = gateway.complete(**adapted_args)
+            print(f"  Response: {response.content[:50]}...")
+        except Exception as e:
+            print(f"  Error: {str(e)}")
+
+    print("\n" + "=" * 60)
+    print("Model characterization test completed!")
+
+if __name__ == "__main__":
+    check_model_characterization()

mojentic/llm/gateways/openai.py

@@ -27,6 +27,58 @@ class OpenAIGateway(LLMGateway):
     def __init__(self, api_key: str, base_url: str = None):
         self.client = OpenAI(api_key=api_key, base_url=base_url)
 
+    def _is_reasoning_model(self, model: str) -> bool:
+        """
+        Determine if a model is a reasoning model that requires max_completion_tokens.
+
+        Parameters
+        ----------
+        model : str
+            The model name to classify.
+
+        Returns
+        -------
+        bool
+            True if the model is a reasoning model, False if it's a chat model.
+        """
+        # OpenAI reasoning models typically start with "o1" or contain "o4"
+        reasoning_model_patterns = [
+            "o1-",
+            "o3-",
+            "o4-",
+            "o1",
+            "o3"
+        ]
+
+        model_lower = model.lower()
+        return any(pattern in model_lower for pattern in reasoning_model_patterns)
+
+    def _adapt_parameters_for_model(self, model: str, args: dict) -> dict:
+        """
+        Adapt parameters based on the model type.
+
+        Parameters
+        ----------
+        model : str
+            The model name.
+        args : dict
+            The original arguments.
+
+        Returns
+        -------
+        dict
+            The adapted arguments with correct parameter names for the model type.
+        """
+        adapted_args = args.copy()
+
+        if self._is_reasoning_model(model) and 'max_tokens' in adapted_args:
+            # For reasoning models, use max_completion_tokens instead of max_tokens
+            adapted_args['max_completion_tokens'] = adapted_args.pop('max_tokens')
+            logger.debug("Adapted max_tokens to max_completion_tokens for reasoning model", 
+                        model=model, max_completion_tokens=adapted_args['max_completion_tokens'])
+
+        return adapted_args
+
     def complete(self, **args) -> LLMGatewayResponse:
         """
         Complete the LLM request by delegating to the OpenAI service.
@@ -56,22 +108,28 @@ class OpenAIGateway(LLMGateway):
         LLMGatewayResponse
             The response from the OpenAI service.
         """
+        # Adapt parameters based on model type
+        adapted_args = self._adapt_parameters_for_model(args['model'], args)
+
         openai_args = {
-            'model': args['model'],
-            'messages': adapt_messages_to_openai(args['messages']),
+            'model': adapted_args['model'],
+            'messages': adapt_messages_to_openai(adapted_args['messages']),
         }
 
         completion = self.client.chat.completions.create
 
-        if 'object_model' in args and args['object_model'] is not None:
+        if 'object_model' in adapted_args and adapted_args['object_model'] is not None:
             completion = self.client.beta.chat.completions.parse
-            openai_args['response_format'] = args['object_model']
+            openai_args['response_format'] = adapted_args['object_model']
 
-        if 'tools' in args and args['tools'] is not None:
-            openai_args['tools'] = [t.descriptor for t in args['tools']]
+        if 'tools' in adapted_args and adapted_args['tools'] is not None:
+            openai_args['tools'] = [t.descriptor for t in adapted_args['tools']]
 
-        if 'max_tokens' in args:
-            openai_args['max_tokens'] = args['max_tokens']
+        # Handle both max_tokens (for chat models) and max_completion_tokens (for reasoning models)
+        if 'max_tokens' in adapted_args:
+            openai_args['max_tokens'] = adapted_args['max_tokens']
+        elif 'max_completion_tokens' in adapted_args:
+            openai_args['max_completion_tokens'] = adapted_args['max_completion_tokens']
 
         response = completion(**openai_args)
 

{mojentic-0.7.3.dist-info → mojentic-0.7.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mojentic
-Version: 0.7.3
+Version: 0.7.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/svetzal/mojentic

{mojentic-0.7.3.dist-info → mojentic-0.7.4.dist-info}/RECORD

@@ -21,6 +21,7 @@ _examples/image_broker.py,sha256=SoIphNj98zk1i7EQc7M2n2O_9ShDHwErmJ6jf67mzX0,355
 _examples/image_broker_splat.py,sha256=O7rzTFUka32if4G4VuXvhu1O-2lRMWfi0r8gjIE8-0Y,1934
 _examples/iterative_solver.py,sha256=ANGdC74ymHosVt6xUBjplkJl_W3ALTGxOkDpPLEDcm8,1331
 _examples/list_models.py,sha256=8noMpGeXOdX5Pf0NXCt_CRurOKEg_5luhWveGntBhe8,578
+_examples/model_characterization.py,sha256=XwLiUP1ZIrNs4ZLmjLDW-nJQsB66H-BV0bWgBgT3N7k,2571
 _examples/oversized_embeddings.py,sha256=_z2JoqZn0g7VtRsFVWIkngVqzjhQQvCEUYWVxs1I7MM,284
 _examples/raw.py,sha256=Y2wvgynFuoUs28agE4ijsLYec8VRjiReklqlCH2lERs,442
 _examples/react.py,sha256=VQ-5MmjUXoHzBFPTV_JrocuOkDzZ8oyUUSYLlEToJ_0,939
@@ -83,7 +84,7 @@ mojentic/llm/gateways/models.py,sha256=OyIaMHKrrx6dHo5FbC8qOFct7PRql9wqbe_BJlgDS
 mojentic/llm/gateways/ollama.py,sha256=OUUImBNzPte52Gsf-e7TBjDHRvYW5flU9ddxwG2zlzk,7909
 mojentic/llm/gateways/ollama_messages_adapter.py,sha256=kUN_p2FyN88_trXMcL-Xsn9xPBU7pGKlJwTUEUCf6G4,1404
 mojentic/llm/gateways/ollama_messages_adapter_spec.py,sha256=gVRbWDrHOa1EiZ0CkEWe0pGn-GKRqdGb-x56HBQeYSE,4981
-mojentic/llm/gateways/openai.py,sha256=O2iMHGGnw96zgni10jE7L1c5HoskGOO5yMqlp8bIu8w,5690
+mojentic/llm/gateways/openai.py,sha256=Wxx_WfG2czOv9Ng8q4JCLFIHGqNs3vaMtE5ggSLBjHk,7787
 mojentic/llm/gateways/openai_message_adapter_spec.py,sha256=ITBSV5njldV_x0NPgjmg8Okf9KzevQJ8dTXM-t6ubcg,6612
 mojentic/llm/gateways/openai_messages_adapter.py,sha256=Scal68JKKdBHB35ok1c5DeWYdD6Wra5oXSsPxJyyXSQ,3947
 mojentic/llm/gateways/tokenizer_gateway.py,sha256=ztuqfunlJ6xmyUPPHcC_69-kegiNJD6jdSEde7hDh2w,485
@@ -131,8 +132,8 @@ mojentic/tracer/tracer_system.py,sha256=7CPy_2tlsHtXQ4DcO5oo52N9a9WS0GH-mjeINzu6
 mojentic/tracer/tracer_system_spec.py,sha256=TNm0f9LV__coBx0JGEKyzzNN9mFjCSG_SSrRISO8Xeg,8632
 mojentic/utils/__init__.py,sha256=lqECkkoFvHFttDnafRE1vvh0Dmna_lwupMToP5VvX5k,115
 mojentic/utils/formatting.py,sha256=bPrwwdluXdQ8TsFxfWtHNOeMWKNvAfABSoUnnA1g7c8,947
-mojentic-0.7.3.dist-info/licenses/LICENSE.md,sha256=txSgV8n5zY1W3NiF5HHsCwlaW0e8We1cSC6TuJUqxXA,1060
-mojentic-0.7.3.dist-info/METADATA,sha256=YTPkYyv6DMo1lluiT6uY5t0xDz1wGyh7dsdRP5ZYTig,5475
-mojentic-0.7.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mojentic-0.7.3.dist-info/top_level.txt,sha256=Q-BvPQ8Eu1jnEqK8Xkr6A9C8Xa1z38oPZRHuA5MCTqg,19
-mojentic-0.7.3.dist-info/RECORD,,
+mojentic-0.7.4.dist-info/licenses/LICENSE.md,sha256=txSgV8n5zY1W3NiF5HHsCwlaW0e8We1cSC6TuJUqxXA,1060
+mojentic-0.7.4.dist-info/METADATA,sha256=shFHb00Ezpkzo6QJOp1vAIhXGONL2jFH7pzIJimPBao,5475
+mojentic-0.7.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mojentic-0.7.4.dist-info/top_level.txt,sha256=Q-BvPQ8Eu1jnEqK8Xkr6A9C8Xa1z38oPZRHuA5MCTqg,19
+mojentic-0.7.4.dist-info/RECORD,,