thinking-machine 0.0.25__tar.gz → 0.0.26__tar.gz

{thinking_machine-0.0.25/src/thinking_machine.egg-info → thinking_machine-0.0.26}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: thinking-machine
-Version: 0.0.25
-Summary: A Machine that thinks.
+Version: 0.0.26
+Summary: Thinking-Machine does thinking.
 Author-email: Machina Ratiocinatrix <machina.ratio@gmail.com>, Alexander Fedotov <alex.fedotov@aol.com>
 Project-URL: Homepage, https://github.com/machina-ratiocinatrix/thinking-machine
 Keywords: thinking-machine
@@ -12,7 +12,6 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pyyaml==6.0.3
-Requires-Dist: click==8.3.1
 Dynamic: license-file
 
 # Thinking-Machine
@@ -49,7 +48,7 @@ cat multilogue.txt | thinking-machine
 ```
 Or:
 ```bash
-cat multilogue.txt | thinking-machine > multilogue.txt
+cat multilogue.txt | thinking-machine > tmp && mv tmp multilogue.txt
 ```
 Or: 
 ```bash
@@ -62,7 +61,7 @@ cat multilogue.txt new_turn.txt | thinking-machine
 ```
 Or:
 ```bash
-cat multilogue.txt new_turn.txt | thinking-machine > multilogue.txt
+cat multilogue.txt new_turn.txt | thinking-machine >  tmp && mv tmp multilogue.txt
 ```
 Or, if you have installed other machines:
 ```bash

{thinking_machine-0.0.25 → thinking_machine-0.0.26}/README.md

@@ -32,7 +32,7 @@ cat multilogue.txt | thinking-machine
 ```
 Or:
 ```bash
-cat multilogue.txt | thinking-machine > multilogue.txt
+cat multilogue.txt | thinking-machine > tmp && mv tmp multilogue.txt
 ```
 Or: 
 ```bash
@@ -45,7 +45,7 @@ cat multilogue.txt new_turn.txt | thinking-machine
 ```
 Or:
 ```bash
-cat multilogue.txt new_turn.txt | thinking-machine > multilogue.txt
+cat multilogue.txt new_turn.txt | thinking-machine >  tmp && mv tmp multilogue.txt
 ```
 Or, if you have installed other machines:
 ```bash

{thinking_machine-0.0.25 → thinking_machine-0.0.26}/pyproject.toml

@@ -4,12 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "thinking-machine"
-version = "0.0.25"
+version = "0.0.26"
 authors = [
     {name="Machina Ratiocinatrix", email="machina.ratio@gmail.com"},
     {name="Alexander Fedotov", email="alex.fedotov@aol.com"}
 ]
-description = "A Machine that thinks."
+description = "Thinking-Machine does thinking."
 readme = "README.md"
 requires-python = ">=3.10"
 classifiers=[
@@ -19,8 +19,7 @@ classifiers=[
 ]
 keywords = ["thinking-machine"]
 dependencies = [
-    "pyyaml == 6.0.3",
-    "click == 8.3.1"
+    "pyyaml == 6.0.3"
 ]
 
 [project.scripts]

{thinking_machine-0.0.25 → thinking_machine-0.0.26}/src/thinking_machine/__init__.py

@@ -7,17 +7,14 @@ LICENSE file in the root directory of this source tree.
 """
 from .config import Config
 from .machine import machine
-from .cli import run
 from .githf import fetch_instructions
 from .utilities import (plato_text_to_muj,
                         plato_text_to_mpuj,
                         llm_soup_to_text,
-                        new_plato_text,
-                        messages_to_mpj)
+                        new_plato_text)
 
 __all__ = [
     'machine',
-    'run',
     'fetch_instructions',
     'Config'
 ]

thinking_machine-0.0.26/src/thinking_machine/cli.py

@@ -0,0 +1,139 @@
+# -*- 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.
+"""
+import os
+import sys
+import select
+import fileinput
+import argparse
+from .config import Config
+from .utilities import new_plato_text
+
+
+def options_and_arguments():
+    # Initialize the parser
+    parser = argparse.ArgumentParser(
+        description="Thinking-Machine thinks for you about the meanings.",
+        epilog="Example:  thinking-machine input_text.txt > output_text.txt"
+        # thinking-machine multilogue.txt > tmp && mv tmp multilogue.txt
+    )
+
+    # Give the access key and token, or set the environment variables in advance.
+    parser.add_argument('-p', '--provider-api-key',
+                        default=os.getenv('PROVIDER_API_KEY', 'no_key'),
+                        help="LLM provider API key (defaults to $PROVIDER_API_KEY)")
+    parser.add_argument('-g', '--github-token',
+                        default=os.getenv('GITHUB_TOKEN', 'no_token'),
+                        help="GitHub API token (defaults to $GITHUB_TOKEN)")
+
+    # Add the interactive flag
+    # parser.add_argument('-i', '--interactive',
+    #                     action='store_true',
+    #                     help="Enable interactive mode (defaults to False)")
+
+    parser.add_argument('-d', '--debug',
+                        action='store_true',
+                        help="Debug mode flag")
+
+    # Positional arguments (files)
+    # '*' captures zero or more arguments into a list, nargs='+' one or more.
+    parser.add_argument('filenames',
+                        nargs='*',
+                        help="Zero (when text comes though a pipe) or more files to process.")
+    return parser
+
+
+def run():
+    """
+    $ text | thinking-machine                        # Accepts text from the pipe
+    $ echo "...<text>..." | thinking-machine         #
+
+    $ thinking-machine multilogue.txt new_turn.txt    # ...or files.
+    """
+
+    args = options_and_arguments().parse_args()
+
+    # If debug - arguments values, raw and parsed.
+    if args.debug:
+        print(f"Debug - Raw arguments: {sys.argv}\n")
+        print(f"provider-api-key: {args.provider_api_key}")
+        print(f"github-token: {args.github_token}")
+        print(f"Files to process: {args.filenames}")
+
+    # If no files are provided AND no data is being piped in - exit.
+    if not args.filenames:
+        # Check if stdin (fd 0) is ready to be read
+        readable, _, _ = select.select([sys.stdin], [], [], 0.1)
+        if not readable:
+            print("Error: No input files or piped text stream.")
+            options_and_arguments().print_help()
+            sys.exit(1)
+
+    config = Config()
+    
+    if args.provider_api_key:
+        if args.provider_api_key.startswith('sk-'):
+            if args.provider_api_key.startswith('sk-proj-'):
+                config.provider = 'OpenAI'
+                os.environ['OPENAI_API_KEY'] = args.provider_api_key
+            elif args.provider_api_key.startswith('sk-ant-'):
+                config.provider = 'Anthropic'
+                os.environ['ANTHROPIC_API_KEY'] = args.provider_api_key
+            else:
+                config.provider = 'DepSek'
+                os.environ['DEPSEK_API_KEY'] = args.provider_api_key
+        elif args.provider_api_key.startswith('AIzaSy'):
+            config.provider = 'Gemini'
+            os.environ['GEMINI_API_KEY'] = args.provider_api_key
+        elif args.provider_api_key.startswith('gsk_'):
+            config.provider = 'Groq'
+            os.environ['GROQ_API_KEY'] = args.provider_api_key
+        elif args.provider_api_key.startswith('xai-'):
+            config.provider = 'XAI'
+            os.environ['XAI_API_KEY'] = args.provider_api_key
+        elif args.provider_api_key.startswith('LLM|'):
+            config.provider = 'Meta'
+            os.environ['META_API_KEY'] = args.provider_api_key
+        elif args.provider_api_key == 'no_provider_key':
+            sys.stderr.write(f'No provider key!\n')
+            sys.stderr.flush()
+            sys.exit(1)
+        else:
+            if config.provider == '':
+                raise ValueError(f"Unrecognized API key prefix and no provider specified.")
+                
+        config.provider_api_key = args.provider_api_key
+        
+    if args.github_token:
+        config.github_token = args.github_token
+        os.environ['GITHUB_TOKEN'] = args.github_token
+
+    # Ingest files line by line. Join is here for long files.
+    lines = []
+    for line in fileinput.input(files=args.filenames or ['-'], encoding="utf-8"):
+        lines.append(line)
+    raw_input = "".join(lines)
+
+    from .machine import machine
+
+    try:
+        thoughts, text = machine(raw_input, config)
+        output = raw_input + new_plato_text(thoughts, text, config.name)
+        sys.stdout.write(output)
+        sys.stdout.flush()
+    except Exception as e:
+        if args.debug:
+            import traceback
+            traceback.print_exc()
+        else:
+            sys.stderr.write(f'Machine did not work {e}\n')
+            sys.stderr.flush()
+        sys.exit(1)
+
+
+if __name__ == '__main__':
+    run()

{thinking_machine-0.0.25 → thinking_machine-0.0.26}/src/thinking_machine/config.py

@@ -15,9 +15,9 @@ class Config:
     github_name: str                = field(default_factory=lambda: environ.get('GITHUB_NAME', ''))
     github_email: str               = field(default_factory=lambda: environ.get('GITHUB_EMAIL', ''))
     provider_api_key: str           = field(default_factory=lambda: environ.get('PROVIDER_API_KEY', ''))
-    provider: str                   = field(default_factory=lambda: environ.get('PROVIDER', 'OpenAI'))
+    provider: str                   = field(default_factory=lambda: environ.get('PROVIDER', ''))
     machine_organization_name: str  = field(default_factory=lambda: environ.get('MACHINE_ORGANIZATION_NAME', 'machina-ratiocinatrix'))
     private_repo_with_text: str     = field(default_factory=lambda: environ.get('PRIVATE_REPO_WITH_TEXT','thinking_machine'))
     system_prompt_file: str         = field(default_factory=lambda: environ.get('SYSTEM_PROMPT_FILE', 'machina.yaml'))
-    name: str                       = field(default_factory=lambda: environ.get('MACHINE-NAME','thinking-machine'))
-    instructions: str               = field(default_factory=lambda: environ.get('MACHINE-DESCRIPTION','The Assistant is Thinking-Machine.'))
+    name: str                       = ''
+    instructions: str               = ''

{thinking_machine-0.0.25 → thinking_machine-0.0.26}/src/thinking_machine/providers/castor_pollux.py

@@ -80,7 +80,7 @@ def respond(messages=None, instructions=None, **kwargs):
     # Set the mandatory headers
     headers = {
         "Content-Type": "application/json",
-        "User-Agent": "Name-of-the-Machine"
+        "User-Agent": "Thinking-Machine"
     }
 
     # urlencode parameter

{thinking_machine-0.0.25 → thinking_machine-0.0.26/src/thinking_machine.egg-info}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: thinking-machine
-Version: 0.0.25
-Summary: A Machine that thinks.
+Version: 0.0.26
+Summary: Thinking-Machine does thinking.
 Author-email: Machina Ratiocinatrix <machina.ratio@gmail.com>, Alexander Fedotov <alex.fedotov@aol.com>
 Project-URL: Homepage, https://github.com/machina-ratiocinatrix/thinking-machine
 Keywords: thinking-machine
@@ -12,7 +12,6 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pyyaml==6.0.3
-Requires-Dist: click==8.3.1
 Dynamic: license-file
 
 # Thinking-Machine
@@ -49,7 +48,7 @@ cat multilogue.txt | thinking-machine
 ```
 Or:
 ```bash
-cat multilogue.txt | thinking-machine > multilogue.txt
+cat multilogue.txt | thinking-machine > tmp && mv tmp multilogue.txt
 ```
 Or: 
 ```bash
@@ -62,7 +61,7 @@ cat multilogue.txt new_turn.txt | thinking-machine
 ```
 Or:
 ```bash
-cat multilogue.txt new_turn.txt | thinking-machine > multilogue.txt
+cat multilogue.txt new_turn.txt | thinking-machine >  tmp && mv tmp multilogue.txt
 ```
 Or, if you have installed other machines:
 ```bash

{thinking_machine-0.0.25 → thinking_machine-0.0.26}/src/thinking_machine.egg-info/requires.txt

@@ -1,2 +1 @@
 pyyaml==6.0.3
-click==8.3.1

{thinking_machine-0.0.25 → thinking_machine-0.0.26}/tests/test_e2e.py

@@ -21,7 +21,7 @@ def test_uvx_integration():
         ".[all]",
         "--from", 
         ".", 
-        "name-of-the-machine"
+        "thinking-machine"
     ]
     
     # The keys/tokens are passed through the environment automatically via env=env.

thinking_machine-0.0.25/src/thinking_machine/cli.py

@@ -1,96 +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 os import environ
-import sys
-import click
-import fileinput
-from .config import Config
-from .utilities import new_plato_text
-
-
-@click.command()
-@click.option('-k', '--provider-api-key',
-              envvar='PROVIDER_API_KEY',
-              default='no_key', help='Language Model API provider key.')
-@click.option('-t', '--github-token', envvar='GITHUB_TOKEN',
-              default='no_token', help='GitHub API token for private repo access.')
-@click.option('-d', '--debug/--no-debug',
-              default=False, help='Print full stack trace on errors.')
-@click.option('-i', '--interactive',
-              is_flag=True, help='Respond and stay interactive')
-@click.argument('filenames', nargs=-1,
-                type=click.Path(exists=True))
-def run(provider_api_key, github_token, debug, interactive, filenames):
-    """
-    $ text | name-of-the-machine                    # Accepts text from the pipe
-    $ echo "...<text>..." | name-of-the-machine     #
-
-    $ name-of-the-machine multilogue.txt new_turn.txt    # Loads files.
-    """
-    config = Config()
-    
-    if provider_api_key:
-        if provider_api_key.startswith('sk-'):
-            if provider_api_key.startswith('sk-proj-'):
-                config.provider = 'OpenAI'
-                environ['OPENAI_API_KEY'] = provider_api_key
-            elif provider_api_key.startswith('sk-ant-'):
-                config.provider = 'Anthropic'
-                environ['ANTHROPIC_API_KEY'] = provider_api_key
-            else:
-                config.provider = 'DepSek'
-                environ['DEPSEK_API_KEY'] = provider_api_key
-        elif provider_api_key.startswith('AIzaSy'):
-            config.provider = 'Gemini'
-            environ['GEMINI_API_KEY'] = provider_api_key
-        elif provider_api_key.startswith('gsk_'):
-            config.provider = 'Groq'
-            environ['GROQ_API_KEY'] = provider_api_key
-        elif provider_api_key.startswith('xai-'):
-            config.provider = 'XAI'
-            environ['XAI_API_KEY'] = provider_api_key
-        elif provider_api_key.startswith('LLM|'):
-            config.provider = 'Meta'
-            environ['META_API_KEY'] = provider_api_key
-        elif provider_api_key == 'no_provider_key':
-            sys.stderr.write(f'No provider key!\n')
-            sys.stderr.flush()
-            sys.exit(1)
-        else:
-            if config.provider == '':
-                raise ValueError(f"Unrecognized API key prefix and no provider specified.")
-                
-        config.provider_api_key = provider_api_key
-        
-    if github_token:
-        config.github_token = github_token
-        environ['GITHUB_TOKEN'] = github_token
-
-    raw_input = ''
-    for line in fileinput.input(files=filenames or ('-',), encoding="utf-8"):
-        raw_input += line
-
-    from .machine import machine
-
-    try:
-        thoughts, text = machine(raw_input, config)
-        output = raw_input + '\n\n' + new_plato_text(thoughts, text, config.name)
-        sys.stdout.write(output)
-        sys.stdout.flush()
-    except Exception as e:
-        if debug:
-            import traceback
-            traceback.print_exc()
-        else:
-            sys.stderr.write(f'Machine did not work {e}\n')
-            sys.stderr.flush()
-        sys.exit(1)
-
-
-if __name__ == '__main__':
-    run()