mojentic 0.8.3__py3-none-any.whl → 0.8.4__py3-none-any.whl

mojentic/llm/gateways/openai.py

@@ -1,4 +1,5 @@
 import json
+import os
 from itertools import islice
 from typing import Type, List, Iterable, Optional
 
@@ -23,11 +24,19 @@ class OpenAIGateway(LLMGateway):
 
     Parameters
     ----------
-    api_key : str
-        The OpenAI API key to use.
+    api_key : str, optional
+        The OpenAI API key to use. If not provided, defaults to the value of the
+        OPENAI_API_KEY environment variable.
+    base_url : str, optional
+        The base URL for the OpenAI API. If not provided, defaults to the value of the
+        OPENAI_API_ENDPOINT environment variable, or None if not set.
     """
 
-    def __init__(self, api_key: str, base_url: Optional[str] = None):
+    def __init__(self, api_key: Optional[str] = None, base_url: Optional[str] = None):
+        if api_key is None:
+            api_key = os.getenv("OPENAI_API_KEY")
+        if base_url is None:
+            base_url = os.getenv("OPENAI_API_ENDPOINT")
         self.client = OpenAI(api_key=api_key, base_url=base_url)
         self.model_registry = get_model_registry()
 

mojentic/llm/gateways/openai_spec.py

@@ -0,0 +1,99 @@
+import os
+from unittest.mock import patch
+
+from mojentic.llm.gateways.openai import OpenAIGateway
+
+
+class DescribeOpenAIGateway:
+    """
+    Unit tests for the OpenAI gateway
+    """
+
+    class DescribeInitialization:
+        """
+        Tests for OpenAI gateway initialization
+        """
+
+        def should_initialize_with_api_key(self, mocker):
+            api_key = "test-api-key"
+            mock_openai = mocker.patch('mojentic.llm.gateways.openai.OpenAI')
+
+            gateway = OpenAIGateway(api_key=api_key)
+
+            mock_openai.assert_called_once_with(api_key=api_key, base_url=None)
+            assert gateway.client is not None
+
+        def should_initialize_with_api_key_and_base_url(self, mocker):
+            api_key = "test-api-key"
+            base_url = "https://custom.openai.com"
+            mock_openai = mocker.patch('mojentic.llm.gateways.openai.OpenAI')
+
+            gateway = OpenAIGateway(api_key=api_key, base_url=base_url)
+
+            mock_openai.assert_called_once_with(api_key=api_key, base_url=base_url)
+            assert gateway.client is not None
+
+        def should_read_api_key_from_environment_variable(self, mocker):
+            api_key = "test-api-key-from-env"
+            mock_openai = mocker.patch('mojentic.llm.gateways.openai.OpenAI')
+
+            with patch.dict(os.environ, {'OPENAI_API_KEY': api_key}):
+                gateway = OpenAIGateway()
+
+            mock_openai.assert_called_once_with(api_key=api_key, base_url=None)
+            assert gateway.client is not None
+
+        def should_read_base_url_from_environment_variable(self, mocker):
+            api_key = "test-api-key"
+            endpoint = "https://corporate.openai.com"
+            mock_openai = mocker.patch('mojentic.llm.gateways.openai.OpenAI')
+
+            with patch.dict(os.environ, {'OPENAI_API_ENDPOINT': endpoint}):
+                gateway = OpenAIGateway(api_key=api_key)
+
+            mock_openai.assert_called_once_with(api_key=api_key, base_url=endpoint)
+            assert gateway.client is not None
+
+        def should_read_both_from_environment_variables(self, mocker):
+            api_key = "test-api-key-from-env"
+            endpoint = "https://corporate.openai.com"
+            mock_openai = mocker.patch('mojentic.llm.gateways.openai.OpenAI')
+
+            with patch.dict(os.environ, {'OPENAI_API_KEY': api_key, 'OPENAI_API_ENDPOINT': endpoint}):
+                gateway = OpenAIGateway()
+
+            mock_openai.assert_called_once_with(api_key=api_key, base_url=endpoint)
+            assert gateway.client is not None
+
+        def should_prefer_explicit_api_key_over_environment_variable(self, mocker):
+            api_key_env = "test-api-key-from-env"
+            api_key_explicit = "test-api-key-explicit"
+            mock_openai = mocker.patch('mojentic.llm.gateways.openai.OpenAI')
+
+            with patch.dict(os.environ, {'OPENAI_API_KEY': api_key_env}):
+                gateway = OpenAIGateway(api_key=api_key_explicit)
+
+            mock_openai.assert_called_once_with(api_key=api_key_explicit, base_url=None)
+            assert gateway.client is not None
+
+        def should_prefer_explicit_base_url_over_environment_variable(self, mocker):
+            api_key = "test-api-key"
+            endpoint_env = "https://corporate.openai.com"
+            endpoint_explicit = "https://explicit.openai.com"
+            mock_openai = mocker.patch('mojentic.llm.gateways.openai.OpenAI')
+
+            with patch.dict(os.environ, {'OPENAI_API_ENDPOINT': endpoint_env}):
+                gateway = OpenAIGateway(api_key=api_key, base_url=endpoint_explicit)
+
+            mock_openai.assert_called_once_with(api_key=api_key, base_url=endpoint_explicit)
+            assert gateway.client is not None
+
+        def should_use_none_when_no_endpoint_specified(self, mocker):
+            api_key = "test-api-key"
+            mock_openai = mocker.patch('mojentic.llm.gateways.openai.OpenAI')
+
+            with patch.dict(os.environ, {}, clear=True):
+                gateway = OpenAIGateway(api_key=api_key)
+
+            mock_openai.assert_called_once_with(api_key=api_key, base_url=None)
+            assert gateway.client is not None

{mojentic-0.8.3.dist-info → mojentic-0.8.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mojentic
-Version: 0.8.3
+Version: 0.8.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
@@ -170,9 +170,9 @@ pip install -e ".[dev]"
 pytest
 ```
 
-## ⚠️ Project Status
+## ✅ Project Status
 
-While the Layer 1 API (LLMBroker, LLMGateway, tool use) has stabilized, the Layer 2 agentic capabilities are under heavy development and will likely change significantly.
+The agentic aspects of this framework are in the highest state of flux. The first layer has stabilized, as have the simpler parts of the second layer, and we're working on the stability of the asynchronous pubsub architecture. We expect Python 3.14 will be the real enabler for the async aspects of the second layer.
 
 ## 📄 License
 

{mojentic-0.8.3.dist-info → mojentic-0.8.4.dist-info}/RECORD

@@ -87,11 +87,12 @@ 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=ru156JpPW8-Zs3_O7BCBuztu_PkP88uD0qbM1Y-RMU4,14032
+mojentic/llm/gateways/openai.py,sha256=JNpbcGInAq97Hm4-GS_5IMNTRhUdSIJtIPdAn6fT_jo,14509
 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/openai_model_registry.py,sha256=CPfbwBhdZ94jzLjmaH9dRXGZFk4OD2pOUlW6RFWVAPM,14101
 mojentic/llm/gateways/openai_model_registry_spec.py,sha256=rCyXhiCOKMewkZjdZoawALoEk62yjENeYTpjYuMuXDM,6711
+mojentic/llm/gateways/openai_spec.py,sha256=eazIk8bLQ2d9CNPGhcw0WedX7CZz-TEkmwGz74c39CM,4161
 mojentic/llm/gateways/openai_temperature_handling_spec.py,sha256=PxQpI57RGaWpt1Dj6z2uLeFcP-dRZTHkai-igZTZc9M,9947
 mojentic/llm/gateways/tokenizer_gateway.py,sha256=ztuqfunlJ6xmyUPPHcC_69-kegiNJD6jdSEde7hDh2w,485
 mojentic/llm/registry/__init__.py,sha256=P2MHlptrtRPMSWbWl9ojXPmjMwkW0rIn6jwzCkSgnhE,164
@@ -138,8 +139,8 @@ mojentic/tracer/tracer_system.py,sha256=PqAHvG4mxUfkdCOiT0mCrzvPAgPNqiTov5TksEBG
 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.8.3.dist-info/licenses/LICENSE.md,sha256=txSgV8n5zY1W3NiF5HHsCwlaW0e8We1cSC6TuJUqxXA,1060
-mojentic-0.8.3.dist-info/METADATA,sha256=wP0ag6Lsy7LCrGosAYf-j1OOjx-xC2B_hhQKOfq1CjQ,6896
-mojentic-0.8.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mojentic-0.8.3.dist-info/top_level.txt,sha256=Q-BvPQ8Eu1jnEqK8Xkr6A9C8Xa1z38oPZRHuA5MCTqg,19
-mojentic-0.8.3.dist-info/RECORD,,
+mojentic-0.8.4.dist-info/licenses/LICENSE.md,sha256=txSgV8n5zY1W3NiF5HHsCwlaW0e8We1cSC6TuJUqxXA,1060
+mojentic-0.8.4.dist-info/METADATA,sha256=uwjgOm_Rbx2rFyeh_NDuVNYiSLvBJePbObI0rXelzcU,7039
+mojentic-0.8.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mojentic-0.8.4.dist-info/top_level.txt,sha256=Q-BvPQ8Eu1jnEqK8Xkr6A9C8Xa1z38oPZRHuA5MCTqg,19
+mojentic-0.8.4.dist-info/RECORD,,