machine-thinking 0.0.3__tar.gz → 0.0.5__tar.gz

{machine_thinking-0.0.3 → machine_thinking-0.0.5}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: machine-thinking
-Version: 0.0.3
-Summary: Package description
+Version: 0.0.5
+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
 Project-URL: Bug Tracker, https://github.com/machina-ratiocinatrix/machine-thinking/issues
@@ -12,7 +12,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pyyaml==6.0.3
 Dynamic: license-file
 
 # Machine thinking

{machine_thinking-0.0.3 → machine_thinking-0.0.5}/pyproject.toml

@@ -3,12 +3,12 @@ requires = ["setuptools>=67.0"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "machine-thinking"
-version = "0.0.3"
+version = "0.0.5"
 authors = [
     {name="Machina Ratiocinatrix", email="machina.ratio@gmail.com"},
     {name="Alexander Fedotov", email="alex.fedotov@aol.com"}
 ]
-description = "Package description"
+description = "Calling the API of 'Thinking-Machines Lab' models without dependencies."
 readme = "README.md"
 requires-python = ">=3.10"
 classifiers=[
@@ -19,13 +19,6 @@ classifiers=[
 
 keywords = ["machine-thinking"]
 
-dependencies = [
-    "pyyaml == 6.0.3"
-]
-
-[project.scripts]
-machine-thinking = "machine_thinking.cli:run"
-
 [project.urls]
 "Homepage" = "https://github.com/machina-ratiocinatrix/machine-thinking"
 "Bug Tracker" = "https://github.com/machina-ratiocinatrix/machine-thinking/issues"

machine_thinking-0.0.3/src/machine_thinking/main.py → machine_thinking-0.0.5/src/machine_thinking/__init__.py

@@ -5,11 +5,3 @@
 This source code is licensed under the license found in the
 LICENSE file in the root directory of this source tree.
 """
-
-
-def main(): # arg=None):
-    print(' main.')
-
-
-if __name__ == '__main__':
-    main()

machine_thinking-0.0.5/src/machine_thinking/completion.py

@@ -0,0 +1,48 @@
+# -*- 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 (default_model,
+                    query)
+
+
+def complete(text, **kwargs):
+    """A completions endpoint call
+    """
+    responses = []
+    payload = {
+        "model":            kwargs.get("model", default_model),
+        "prompt":           kwargs.get("prompt", text),
+        "response_format":  kwargs.get('response_format', {'type': 'text'}),
+        "reasoning_effort": kwargs.get("reasoning_effort", "high"),
+        "reasoning_history":kwargs.get("reasoning_history", "interleaved"),
+        "thinking":         kwargs.get("thinking", None),
+        "max_tokens":       kwargs.get("max_tokens", 5),
+        "n":                kwargs.get("n", 1),
+        "stop":             kwargs.get("stop_sequences", ["stop"]),
+        # "seed":             kwargs.get("seed", None),
+        "frequency_penalty":kwargs.get("frequency_penalty", 0),
+        "presence_penalty": kwargs.get("presence_penalty", 0),
+        # "logit_bias":       kwargs.get("logit_bias", None),
+        "logprobs":         kwargs.get("logprobs", None),
+        # "top_logprobs":     kwargs.get("top_logprobs", None),
+        "temperature":      kwargs.get("temperature", 1),
+        "top_p":            kwargs.get("top_p", 1),
+        'top_k':            kwargs.get('top_k', 50),
+        'stream':           False,
+        # "user":             kwargs.get("user", None)
+    }
+
+    responses = query(payload, '/completions')
+    response = responses['choices'][0]
+    text = response['text']
+    thoughts = ''
+
+    return thoughts, text
+
+
+if __name__ == '__main__':
+    ...

machine_thinking-0.0.5/src/machine_thinking/messages.py

@@ -0,0 +1,81 @@
+# -*- 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__':
+    ...

{machine_thinking-0.0.3 → machine_thinking-0.0.5}/src/machine_thinking/utils.py

@@ -13,7 +13,8 @@ from os import environ
 
 api_key = environ.get("TINKER_API_KEY", '')
 default_model = environ.get("TINKER_DEFAULT_MODEL", 'thinkingmachines/Inkling')
-api_base = environ.get("TINKER_API_BASE", 'https://tinker.thinkingmachines.dev/services/tinker-prod/oai/api/v1')
+api_base_oai = environ.get("TINKER_OAI_API_BASE", 'https://tinker.thinkingmachines.dev/services/tinker-prod/oai/api/v1')
+api_base_ant = environ.get("TINKER_ANT_API_BASE", 'https://tinker.thinkingmachines.dev/services/tinker-prod/anthropic/api')
 
 
 # Set the mandatory headers
@@ -72,8 +73,12 @@ def call_function(func, func_args):
     return result
 
 
-def query(payload, url_suffix):
+def query(payload, url_suffix, url_prefix=None):
     # Convert data dictionary to JSON and encode it to bytes
+    if url_prefix:
+        api_base = url_prefix
+    else:
+        api_base= api_base_oai
     data_bytes = json.dumps(payload).encode('utf-8')
     # Create the Request object
     req = urllib.request.Request(

{machine_thinking-0.0.3 → machine_thinking-0.0.5}/src/machine_thinking.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: machine-thinking
-Version: 0.0.3
-Summary: Package description
+Version: 0.0.5
+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
 Project-URL: Bug Tracker, https://github.com/machina-ratiocinatrix/machine-thinking/issues
@@ -12,7 +12,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pyyaml==6.0.3
 Dynamic: license-file
 
 # Machine thinking

{machine_thinking-0.0.3 → machine_thinking-0.0.5}/src/machine_thinking.egg-info/SOURCES.txt

@@ -1,14 +1,13 @@
 LICENSE
 README.md
 pyproject.toml
+src/__init__.py
 src/machine_thinking/__init__.py
 src/machine_thinking/chat.py
-src/machine_thinking/cli.py
-src/machine_thinking/main.py
+src/machine_thinking/completion.py
+src/machine_thinking/messages.py
 src/machine_thinking/utils.py
 src/machine_thinking.egg-info/PKG-INFO
 src/machine_thinking.egg-info/SOURCES.txt
 src/machine_thinking.egg-info/dependency_links.txt
-src/machine_thinking.egg-info/entry_points.txt
-src/machine_thinking.egg-info/requires.txt
 src/machine_thinking.egg-info/top_level.txt

{machine_thinking-0.0.3 → machine_thinking-0.0.5}/src/machine_thinking.egg-info/top_level.txt

@@ -1 +1,2 @@
+__init__
 machine_thinking

machine_thinking-0.0.3/src/machine_thinking/cli.py

@@ -1,12 +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 .main import main
-
-
-def run(): #arg):  # (count, arg): if with option.
-    main() #arg)

machine_thinking-0.0.3/src/machine_thinking.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-machine-thinking = machine_thinking.cli:run

machine_thinking-0.0.3/src/machine_thinking.egg-info/requires.txt

@@ -1 +0,0 @@
-pyyaml==6.0.3