llms-py 2.0.13__tar.gz → 2.0.15__tar.gz

llms_py-2.0.15/MANIFEST.in

@@ -0,0 +1,4 @@
+include README.md
+include LICENSE
+include requirements.txt
+recursive-include llms *

{llms_py-2.0.13/llms_py.egg-info → llms_py-2.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llms-py
-Version: 2.0.13
+Version: 2.0.15
 Summary: A lightweight CLI tool and OpenAI-compatible server for querying multiple Large Language Model (LLM) providers
 Home-page: https://github.com/ServiceStack/llms
 Author: ServiceStack

llms_py-2.0.15/llms/__init__.py

@@ -0,0 +1,2 @@
+# Import the main module content
+from .main import *

llms_py-2.0.15/llms/__main__.py

@@ -0,0 +1,9 @@
+#!/usr/bin/env python3
+"""
+Entry point for running llms as a module: python -m llms
+"""
+
+from .main import main
+
+if __name__ == "__main__":
+    main()

llms_py-2.0.13/llms.py → llms_py-2.0.15/llms/main.py

@@ -22,7 +22,7 @@ from aiohttp import web
 from pathlib import Path
 from importlib import resources   # Py≥3.9  (pip install importlib_resources for 3.7/3.8)
 
-VERSION = "2.0.13"
+VERSION = "2.0.15"
 _ROOT = None
 g_config_path = None
 g_ui_path = None
@@ -947,6 +947,36 @@ def resolve_root():
         # importlib.resources not available (Python < 3.9)
         pass
 
+    # Method 1b: Look for the installed package and check for UI files
+    try:
+        import llms
+        # If llms is a package, check its directory
+        if hasattr(llms, '__path__'):
+            # It's a package
+            package_path = Path(llms.__path__[0])
+
+            # Check if UI files are in the package directory
+            if (package_path / "index.html").exists() and (package_path / "ui").is_dir():
+                _log(f"RESOURCE ROOT (package directory): {package_path}")
+                return package_path
+        else:
+            # It's a module
+            module_path = Path(llms.__file__).resolve().parent
+
+            # Check if UI files are in the same directory as the module
+            if (module_path / "index.html").exists() and (module_path / "ui").is_dir():
+                _log(f"RESOURCE ROOT (module directory): {module_path}")
+                return module_path
+
+            # Check parent directory (sometimes data files are installed one level up)
+            parent_path = module_path.parent
+            if (parent_path / "index.html").exists() and (parent_path / "ui").is_dir():
+                _log(f"RESOURCE ROOT (module parent): {parent_path}")
+                return parent_path
+
+    except (ImportError, AttributeError):
+        pass
+
     # Method 2: Try to find data files in sys.prefix (where data_files are installed)
     # Get all possible installation directories
     possible_roots = [
@@ -976,6 +1006,22 @@ def resolve_root():
     except AttributeError:
         pass
 
+    # Method 2b: Look for data files in common macOS Homebrew locations
+    # Homebrew often installs data files in different locations
+    homebrew_roots = []
+    if sys.platform == "darwin":  # macOS
+        homebrew_prefixes = ["/opt/homebrew", "/usr/local"]  # Apple Silicon and Intel
+        for prefix in homebrew_prefixes:
+            if Path(prefix).exists():
+                homebrew_roots.extend([
+                    Path(prefix),
+                    Path(prefix) / "share",
+                    Path(prefix) / "lib" / "python3.11" / "site-packages",
+                    Path(prefix) / "lib" / f"python{sys.version_info.major}.{sys.version_info.minor}" / "site-packages",
+                ])
+
+    possible_roots.extend(homebrew_roots)
+
     for root in possible_roots:
         try:
             if root.exists() and (root / "index.html").exists() and (root / "ui").is_dir():
@@ -1118,12 +1164,12 @@ def main():
             if resource_exists(resource_config_path):
                 try:
                     # Read config from resource (handle both Path and Traversable objects)
-                    config_json = read_resource_text(resource_ui_path)
+                    config_json = read_resource_text(resource_config_path)
                 except (OSError, AttributeError) as e:
                     _log(f"Error reading resource config: {e}")
             if not config_json:
                 try:
-                    config_json = asyncio.run(save_text(github_url("llms.json"), home_ui_path))
+                    config_json = asyncio.run(save_text(github_url("llms.json"), home_config_path))
                 except Exception as e:
                     _log(f"Error downloading llms.json: {e}")
                     print("Could not create llms.json. Create one with --init or use --config <path>")
@@ -1279,6 +1325,20 @@ def main():
                 raise web.HTTPNotFound
 
         app.router.add_get("/ui/{path:.*}", ui_static, name="ui_static")
+        
+        async def ui_config_handler(request):
+            with open(g_ui_path, "r") as f:
+                ui = json.load(f)
+                if 'defaults' not in ui:
+                    ui['defaults'] = g_config['defaults']
+                enabled, disabled = provider_status()
+                ui['status'] = {
+                    "all": list(g_config['providers'].keys()),
+                    "enabled": enabled, 
+                    "disabled": disabled 
+                }
+                return web.json_response(ui)
+        app.router.add_get('/config', ui_config_handler)
 
         async def not_found_handler(request):
             return web.Response(text="404: Not Found", status=404)
@@ -1294,23 +1354,9 @@ def main():
 
         # Serve index.html as fallback route (SPA routing)
         app.router.add_route('*', '/{tail:.*}', index_handler)
-        
-        async def ui_config_handler(request):
-            with open(g_ui_path, "r") as f:
-                ui = json.load(f)
-                if 'defaults' not in ui:
-                    ui['defaults'] = g_config['defaults']
-                enabled, disabled = provider_status()
-                ui['status'] = {
-                    "all": list(g_config['providers'].keys()),
-                    "enabled": enabled, 
-                    "disabled": disabled 
-                }
-                return web.json_response(ui)
-        app.router.add_get('/config', ui_config_handler)
 
         print(f"Starting server on port {port}...")
-        web.run_app(app, host='0.0.0.0', port=port)
+        web.run_app(app, host='0.0.0.0', port=port, print=_log)
         exit(0)
 
     if cli_args.enable is not None:
@@ -1436,5 +1482,5 @@ def main():
     parser.print_help()
 
 
-if __name__ == "__main__":
+if __name__ == "__main__":    
     main()

{llms_py-2.0.13 → llms_py-2.0.15/llms}/ui/ai.mjs

@@ -6,7 +6,7 @@ const headers = { 'Accept': 'application/json' }
 const prefsKey = 'llms.prefs'
 
 export const o = {
-    version: '2.0.13',
+    version: '2.0.15',
     base,
     prefsKey,
     welcome: 'Welcome to llms.py',

{llms_py-2.0.13 → llms_py-2.0.15/llms_py.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llms-py
-Version: 2.0.13
+Version: 2.0.15
 Summary: A lightweight CLI tool and OpenAI-compatible server for querying multiple Large Language Model (LLM) providers
 Home-page: https://github.com/ServiceStack/llms
 Author: ServiceStack

llms_py-2.0.15/llms_py.egg-info/SOURCES.txt

@@ -0,0 +1,53 @@
+LICENSE
+MANIFEST.in
+README.md
+pyproject.toml
+requirements.txt
+setup.py
+llms/__init__.py
+llms/__main__.py
+llms/index.html
+llms/llms.json
+llms/main.py
+llms/ui.json
+llms/__pycache__/__init__.cpython-312.pyc
+llms/__pycache__/__main__.cpython-312.pyc
+llms/__pycache__/llms.cpython-312.pyc
+llms/__pycache__/main.cpython-312.pyc
+llms/ui/App.mjs
+llms/ui/Avatar.mjs
+llms/ui/Brand.mjs
+llms/ui/ChatPrompt.mjs
+llms/ui/Main.mjs
+llms/ui/ModelSelector.mjs
+llms/ui/ProviderStatus.mjs
+llms/ui/Recents.mjs
+llms/ui/SettingsDialog.mjs
+llms/ui/Sidebar.mjs
+llms/ui/SignIn.mjs
+llms/ui/SystemPromptEditor.mjs
+llms/ui/SystemPromptSelector.mjs
+llms/ui/Welcome.mjs
+llms/ui/ai.mjs
+llms/ui/app.css
+llms/ui/fav.svg
+llms/ui/markdown.mjs
+llms/ui/tailwind.input.css
+llms/ui/threadStore.mjs
+llms/ui/typography.css
+llms/ui/utils.mjs
+llms/ui/lib/highlight.min.mjs
+llms/ui/lib/idb.min.mjs
+llms/ui/lib/marked.min.mjs
+llms/ui/lib/servicestack-client.mjs
+llms/ui/lib/servicestack-vue.mjs
+llms/ui/lib/vue-router.min.mjs
+llms/ui/lib/vue.min.mjs
+llms/ui/lib/vue.mjs
+llms_py.egg-info/PKG-INFO
+llms_py.egg-info/SOURCES.txt
+llms_py.egg-info/dependency_links.txt
+llms_py.egg-info/entry_points.txt
+llms_py.egg-info/not-zip-safe
+llms_py.egg-info/requires.txt
+llms_py.egg-info/top_level.txt

llms_py-2.0.15/llms_py.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+llms = llms.main:main

{llms_py-2.0.13 → llms_py-2.0.15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "llms-py"
-version = "2.0.13"
+version = "2.0.15"
 description = "A lightweight CLI tool and OpenAI-compatible server for querying multiple Large Language Model (LLM) providers"
 readme = "README.md"
 license = "BSD-3-Clause"
@@ -47,10 +47,10 @@ Repository = "https://github.com/ServiceStack/llms"
 "Bug Reports" = "https://github.com/ServiceStack/llms/issues"
 
 [project.scripts]
-llms = "llms:main"
+llms = "llms.main:main"
 
 [tool.setuptools]
-py-modules = ["llms"]
+packages = ["llms"]
 
 [tool.setuptools.package-data]
-"*" = ["llms.json", "README.md", "LICENSE", "requirements.txt", "index.html", "ui/**/*"]
+llms = ["index.html", "llms.json", "ui.json", "ui/*", "ui/lib/*"]

{llms_py-2.0.13 → llms_py-2.0.15}/setup.py

@@ -16,7 +16,7 @@ with open(os.path.join(this_directory, "requirements.txt"), encoding="utf-8") as
 
 setup(
     name="llms-py",
-    version="2.0.13",
+    version="2.0.15",
     author="ServiceStack",
     author_email="team@servicestack.net",
     description="A lightweight CLI tool and OpenAI-compatible server for querying multiple Large Language Model (LLM) providers",
@@ -28,12 +28,21 @@ setup(
         "Source": "https://github.com/ServiceStack/llms",
         "Documentation": "https://github.com/ServiceStack/llms#readme",
     },
-    py_modules=["llms"],
+    packages=["llms"],
+    package_data={
+        "llms": [
+            "index.html",
+            "llms.json",
+            "ui.json",
+            "ui/*",
+            "ui/lib/*",
+        ]
+    },
     install_requires=requirements,
     python_requires=">=3.7",
     entry_points={
         "console_scripts": [
-            "llms=llms:main",
+            "llms=llms.main:main",
         ],
     },
     classifiers=[
@@ -58,47 +67,5 @@ setup(
     ],
     keywords="llm ai openai anthropic google gemini groq mistral ollama cli server chat completion",
     include_package_data=True,
-    data_files=[
-        ("", ["index.html", "ui.json", "llms.json", "requirements.txt"]),
-        (
-            "ui",
-            [
-                "ui/ai.mjs",
-                "ui/app.css",
-                "ui/App.mjs",
-                "ui/Avatar.mjs",
-                "ui/Brand.mjs",
-                "ui/ChatPrompt.mjs",
-                "ui/fav.svg",
-                "ui/Main.mjs",
-                "ui/markdown.mjs",
-                "ui/ModelSelector.mjs",
-                "ui/ProviderStatus.mjs",
-                "ui/Recents.mjs",
-                "ui/SettingsDialog.mjs",
-                "ui/Sidebar.mjs",
-                "ui/SignIn.mjs",
-                "ui/SystemPromptEditor.mjs",
-                "ui/SystemPromptSelector.mjs",
-                "ui/tailwind.input.css",
-                "ui/threadStore.mjs",
-                "ui/typography.css",
-                "ui/utils.mjs",
-                "ui/Welcome.mjs",
-            ],
-        ),
-        (
-            "ui/lib",
-            [
-                "ui/lib/highlight.min.mjs",
-                "ui/lib/idb.min.mjs",
-                "ui/lib/marked.min.mjs",
-                "ui/lib/servicestack-client.mjs",
-                "ui/lib/servicestack-vue.mjs",
-                "ui/lib/vue-router.min.mjs",
-                "ui/lib/vue.min.mjs",
-            ],
-        ),
-    ],
     zip_safe=False,
 )

llms_py-2.0.13/MANIFEST.in

@@ -1,7 +0,0 @@
-include README.md
-include LICENSE
-include requirements.txt
-include llms.json
-include index.html
-include ui.json
-recursive-include ui *

llms_py-2.0.13/llms_py.egg-info/SOURCES.txt

@@ -1,47 +0,0 @@
-LICENSE
-MANIFEST.in
-README.md
-index.html
-llms.json
-llms.py
-pyproject.toml
-requirements.txt
-setup.py
-ui.json
-llms_py.egg-info/PKG-INFO
-llms_py.egg-info/SOURCES.txt
-llms_py.egg-info/dependency_links.txt
-llms_py.egg-info/entry_points.txt
-llms_py.egg-info/not-zip-safe
-llms_py.egg-info/requires.txt
-llms_py.egg-info/top_level.txt
-ui/App.mjs
-ui/Avatar.mjs
-ui/Brand.mjs
-ui/ChatPrompt.mjs
-ui/Main.mjs
-ui/ModelSelector.mjs
-ui/ProviderStatus.mjs
-ui/Recents.mjs
-ui/SettingsDialog.mjs
-ui/Sidebar.mjs
-ui/SignIn.mjs
-ui/SystemPromptEditor.mjs
-ui/SystemPromptSelector.mjs
-ui/Welcome.mjs
-ui/ai.mjs
-ui/app.css
-ui/fav.svg
-ui/markdown.mjs
-ui/tailwind.input.css
-ui/threadStore.mjs
-ui/typography.css
-ui/utils.mjs
-ui/lib/highlight.min.mjs
-ui/lib/idb.min.mjs
-ui/lib/marked.min.mjs
-ui/lib/servicestack-client.mjs
-ui/lib/servicestack-vue.mjs
-ui/lib/vue-router.min.mjs
-ui/lib/vue.min.mjs
-ui/lib/vue.mjs

llms_py-2.0.13/llms_py.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-llms = llms:main