machine-thinking 0.0.6__tar.gz → 0.0.8__tar.gz

{machine_thinking-0.0.6 → machine_thinking-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machine-thinking
-Version: 0.0.6
+Version: 0.0.8
 Summary: Calling the API of 'Thinking-Machines Lab' models without dependencies.
 Author-email: Machina Ratiocinatrix <machina.ratio@gmail.com>, Alexander Fedotov <alex.fedotov@aol.com>
 Project-URL: Homepage, https://github.com/machina-ratiocinatrix/machine-thinking

{machine_thinking-0.0.6 → machine_thinking-0.0.8}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=67.0"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "machine-thinking"
-version = "0.0.6"
+version = "0.0.8"
 authors = [
     {name="Machina Ratiocinatrix", email="machina.ratio@gmail.com"},
     {name="Alexander Fedotov", email="alex.fedotov@aol.com"}

machine_thinking-0.0.8/src/machine_thinking/messages.py

@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+# Python
+
+"""Copyright (c) Alexander Fedotov.
+This source code is licensed under the license found in the
+LICENSE file in the root directory of this source tree.
+"""
+from .utils import (query,
+                    default_model,
+                    get_function,
+                    get_func_args,
+                    call_function,
+                    api_base_ant,
+                    decode)
+
+
+def get_weather(location):
+    # print(f"Executing weather tool for location: {location}")
+    return {"temperature": "72F", "condition": "Sunny"}
+
+
+def message(messages=None, instructions=None, tools=None, **kwargs):
+    """A continuation of text with a given context and instruction.
+    """
+    messages = kwargs.get('messages', messages)
+
+    payload = {
+        "model": kwargs.get("model", default_model),
+        "system": kwargs.get("system_instruction", instructions),
+        "messages": kwargs.get('messages', messages),
+        "thinking": kwargs.get('thinking', None),
+        "max_tokens": kwargs.get("max_tokens", 100),
+        "stop_sequences": kwargs.get("stop_sequences", ['stop']),
+        "stream": kwargs.get("stream", False),
+        "temperature": 1.0,
+        "output_config": kwargs.get("output_config", {}),
+        "metadata": kwargs.get("metadata", None)
+    }
+    if tools:
+        payload['tools'] = tools
+        payload['tool_choice'] = kwargs.get('tool_choice', {})
+
+    while True:
+        result = query(payload, '/messages', api_base_ant)
+        completion_message = result['content']
+        thoughts, text, function_calls = decode(completion_message)
+        if function_calls:
+            payload['messages'].append({"role": "assistant", "content": completion_message})
+            tools_results = []
+            # Call all requested functions and create response messages.
+            for function_call in function_calls:
+                call_id = function_call.get('id')
+                func_name = function_call.get('name', '')
+                func_args_def = function_call.get('input', '{}')
+                # Look up tool by name in globals and caller frames
+                func = get_function(func_name)
+                func_args = get_func_args(func_args_def)
+                result = call_function(func, func_args)
+                tool_message = {
+                    "type": "tool_result",
+                    "tool_use_id": call_id,
+                    "content": result
+                }
+                tools_results.append(tool_message)
+
+            # Add results to payload and make a query.
+            payload['messages'].append({"role": "user", "content": tools_results})
+
+        else:
+            break
+
+    return thoughts, text
+
+
+if __name__ == '__main__':
+    ...

{machine_thinking-0.0.6 → machine_thinking-0.0.8}/src/machine_thinking/utils.py

@@ -41,13 +41,12 @@ def get_function(func_name):
     return func
 
 
-def get_func_args(func_def):
+def get_func_args(func_args_def):
     try:
-        func_args_str = func_def.get('arguments')
-        if isinstance(func_args_str, str):
-            func_args = json.loads(func_args_str)
+        if isinstance(func_args_def, str):
+            func_args = json.loads(func_args_def)
         else:
-            func_args = func_args_str
+            func_args = func_args_def
     except Exception as e:
         func_args = {}
         print(f"Error parsing tool arguments: {e}")
@@ -105,3 +104,20 @@ def query(payload, url_suffix, url_prefix=None):
         # Handle network/connection errors
         print(f"Failed to reach the server: {e.reason}")
         return {}
+
+
+def decode(output):
+    text = ''
+    thoughts = ''
+    for chunk in output:
+        chunk_type = chunk.get('type', '')
+        if chunk_type == 'text':
+            addition = chunk.get('text', '')
+            if addition not in ('\n\n', '\n'):
+                text += addition
+
+        elif chunk_type == 'thinking':
+            thoughts += chunk.get('thinking', '')
+    function_calls = [part for part in output if part['type'] == 'tool_use']
+
+    return thoughts, text, function_calls

{machine_thinking-0.0.6 → machine_thinking-0.0.8}/src/machine_thinking.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machine-thinking
-Version: 0.0.6
+Version: 0.0.8
 Summary: Calling the API of 'Thinking-Machines Lab' models without dependencies.
 Author-email: Machina Ratiocinatrix <machina.ratio@gmail.com>, Alexander Fedotov <alex.fedotov@aol.com>
 Project-URL: Homepage, https://github.com/machina-ratiocinatrix/machine-thinking

machine_thinking-0.0.6/src/machine_thinking/messages.py

@@ -1,81 +0,0 @@
-# -*- coding: utf-8 -*-
-# Python
-
-"""Copyright (c) Alexander Fedotov.
-This source code is licensed under the license found in the
-LICENSE file in the root directory of this source tree.
-"""
-from .utils import (query,
-                    default_model,
-                    get_function,
-                    get_func_args,
-                    call_function,
-                    api_base_ant)
-
-
-def get_weather(location):
-    # print(f"Executing weather tool for location: {location}")
-    return {"temperature": "72F", "condition": "Sunny"}
-
-
-def message(messages=None, instructions=None, tools=None, **kwargs):
-    """A continuation of text with a given context and instruction.
-    """
-    messages = kwargs.get('messages', messages)
-
-    payload = {
-        'model':                    kwargs.get('model', default_model),
-        'system':                   kwargs.get('system', instructions),
-        'messages':                 kwargs.get('messages', messages),
-        'output_config':            kwargs.get('output_config',{'effort': 'high'}),
-        'thinking':                 kwargs.get('thinking', {
-                                                            'type': 'enabled',
-                                                            'budget_tokens': 10000,
-                                                            }),
-        'tool_choice':              kwargs.get('tool_choice', {'type': 'auto', 'disable_parallel_tool_use': False}),
-        'max_tokens':               kwargs.get('max_tokens', 4096),
-        'prompt_truncate_len':      kwargs.get('prompt_truncate_len', 100000),
-        'n':                        kwargs.get('n', 1),
-        'top_p':                    kwargs.get('top_p', 0.9),
-        'top_k':                    kwargs.get('top_k', 10),
-        'stream':                   False
-    }
-    if tools:
-        payload['tools'] = tools
-        payload['parallel_tool_calls'] = True
-        payload['tool_choice'] = 'auto'
-
-    while True:
-        result = query(payload, '/messages', api_base_ant)
-        completion_message = result['choices'][0]['message']
-        messages.append(completion_message)
-        thoughts = completion_message.get('reasoning_content', '')
-        text = completion_message.get('content', '')
-        function_calls = completion_message.get('tool_calls', [])
-
-        if function_calls:
-            # Call all requested functions and create response messages.
-            for function_call in function_calls:
-                call_id = function_call.get('id')
-                func_def = function_call.get('function')
-                func_name = func_def.get('name', '')
-
-                # Look up tool by name in globals and caller frames
-                func = get_function(func_name)
-                func_args = get_func_args(func_def)
-                result = call_function(func, func_args)
-
-                tool_message = {
-                    "role": "tool",
-                    "tool_call_id": call_id,
-                    "content": result
-                }
-                messages.append(tool_message)
-        else:
-            break
-
-    return thoughts, text
-
-
-if __name__ == '__main__':
-    ...