llms-py 2.0.13__py3-none-any.whl → 2.0.15__py3-none-any.whl

llms/__init__.py

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

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 → 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.data/data → 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',