llms-py 2.0.3__tar.gz → 2.0.5__tar.gz

{llms_py-2.0.3/llms_py.egg-info → llms_py-2.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llms-py
-Version: 2.0.3
+Version: 2.0.5
 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.3 → llms_py-2.0.5}/llms.py

@@ -12,6 +12,8 @@ import subprocess
 import base64
 import mimetypes
 import traceback
+import sys
+import site
 
 import aiohttp
 from aiohttp import web
@@ -19,7 +21,8 @@ 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.3"
+VERSION = "2.0.5"
+_ROOT = None
 g_config_path = None
 g_ui_path = None
 g_config = None
@@ -785,9 +788,117 @@ def disable_provider(provider):
     save_config(g_config)
     init_llms(g_config)
 
+def resolve_root():
+    # Try to find the resource root directory
+    # When installed as a package, static files may be in different locations
+
+    # Method 1: Try importlib.resources for package data (Python 3.9+)
+    try:
+        try:
+            # Try to access the package resources
+            pkg_files = resources.files("llms")
+            # Check if ui directory exists in package resources
+            if hasattr(pkg_files, 'is_dir') and (pkg_files / "ui").is_dir():
+                _log(f"RESOURCE ROOT (package): {pkg_files}")
+                return pkg_files
+        except (FileNotFoundError, AttributeError, TypeError):
+            # Package doesn't have the resources, try other methods
+            pass
+    except ImportError:
+        # importlib.resources not available (Python < 3.9)
+        pass
+
+    # Method 2: Try to find data files in sys.prefix (where data_files are installed)
+    # Get all possible installation directories
+    possible_roots = [
+        Path(sys.prefix),  # Standard installation
+        Path(sys.prefix) / "share",  # Some distributions
+        Path(sys.base_prefix),  # Virtual environments
+        Path(sys.base_prefix) / "share",
+    ]
+
+    # Add site-packages directories
+    for site_dir in site.getsitepackages():
+        possible_roots.extend([
+            Path(site_dir),
+            Path(site_dir).parent,
+            Path(site_dir).parent / "share",
+        ])
+
+    # Add user site directory
+    try:
+        user_site = site.getusersitepackages()
+        if user_site:
+            possible_roots.extend([
+                Path(user_site),
+                Path(user_site).parent,
+                Path(user_site).parent / "share",
+            ])
+    except AttributeError:
+        pass
+
+    for root in possible_roots:
+        try:
+            if root.exists() and (root / "index.html").exists() and (root / "ui").is_dir():
+                _log(f"RESOURCE ROOT (data files): {root}")
+                return root
+        except (OSError, PermissionError):
+            continue
+
+    # Method 3: Development mode - look relative to this file
+    # __file__ is *this* module; look in same directory first, then parent
+    dev_roots = [
+        Path(__file__).resolve().parent,  # Same directory as llms.py
+        Path(__file__).resolve().parent.parent,  # Parent directory (repo root)
+    ]
+
+    for root in dev_roots:
+        try:
+            if (root / "index.html").exists() and (root / "ui").is_dir():
+                _log(f"RESOURCE ROOT (development): {root}")
+                return root
+        except (OSError, PermissionError):
+            continue
+
+    # Fallback: use the directory containing this file
+    from_file = Path(__file__).resolve().parent
+    _log(f"RESOURCE ROOT (fallback): {from_file}")
+    return from_file
+
+def resource_exists(resource_path):
+    # Check if resource files exist (handle both Path and Traversable objects)
+    try:
+        if hasattr(resource_path, 'is_file'):
+            return resource_path.is_file()
+        else:
+            return os.path.exists(resource_path)
+    except (OSError, AttributeError):
+        pass
+
+def read_resource_text(resource_path):
+    if hasattr(resource_path, 'read_text'):
+        return resource_path.read_text()
+    else:
+        with open(resource_path, "r") as f:
+            return f.read()
+
+def read_resource_file_bytes(resource_file):
+    try:
+        if hasattr(_ROOT, 'joinpath'):
+            # importlib.resources Traversable
+            index_resource = _ROOT.joinpath(resource_file)
+            if index_resource.is_file():
+                return index_resource.read_bytes()
+        else:
+            # Regular Path object
+            index_path = _ROOT / resource_file
+            if index_path.exists():
+                return index_path.read_bytes()
+    except (OSError, PermissionError, AttributeError) as e:
+        _log(f"Error reading resource bytes: {e}")
 
 def main():
-    global g_verbose, g_default_model, g_logprefix, g_config_path, g_ui_path
+    global _ROOT, g_verbose, g_default_model, g_logprefix, g_config_path, g_ui_path
 
     parser = argparse.ArgumentParser(description=f"llms v{VERSION}")
     parser.add_argument('--config',       default=None, help='Path to config file', metavar='FILE')
@@ -827,20 +938,14 @@ def main():
     if cli_args.config is not None:
         g_config_path = os.path.join(os.path.dirname(__file__), cli_args.config)
 
-    try:
-        from importlib.resources import files
-        _ROOT = files("llms")
-        _log(f"RESOURCE ROOT: {_ROOT}")
-    except ModuleNotFoundError:
-        # package not installed
-        # __file__ is *this* module; climb two levels to repo root
-        _ROOT = Path(__file__).resolve().parent.parent / "llms"
-        _log(f"__file__: {Path(__file__).resolve()}")
-        _log(f"PATH ROOT: {_ROOT}")
-
+    _ROOT = resolve_root()
     if cli_args.root:
         _ROOT = Path(cli_args.root)
 
+    if not _ROOT:
+        print("Resource root not found")
+        exit(1)
+
     g_config_path = os.path.join(os.path.dirname(__file__), cli_args.config) if cli_args.config else get_config_path()
     g_ui_path = get_ui_path()
 
@@ -865,21 +970,32 @@ def main():
 
     if not g_config_path or not os.path.exists(g_config_path):
         # copy llms.json and ui.json to llms_home
-        if not os.path.exists(home_config_path) and os.path.exists(resource_config_path):
+ 
+        if not os.path.exists(home_config_path) and resource_exists(resource_config_path):
             llms_home = os.path.dirname(home_config_path)
             os.makedirs(llms_home, exist_ok=True)
-            with open(resource_config_path, "r") as f:
-                config_json = f.read()
+
+            # Read config from resource (handle both Path and Traversable objects)
+            try:
+                config_json = read_resource_text(resource_config_path)
                 with open(home_config_path, "w") as f:
                     f.write(config_json)
                     _log(f"Created default config at {home_config_path}")
-            
-            if not os.path.exists(home_ui_path) and os.path.exists(resource_ui_path):
-                with open(resource_ui_path, "r") as f:
-                    ui_json = f.read()
+            except (OSError, AttributeError) as e:
+                _log(f"Error reading resource config: {e}")
+
+            # Read UI config from resource
+            if not os.path.exists(home_ui_path) and resource_exists(resource_ui_path):
+                try:
+                    ui_json = read_resource_text(resource_ui_path)
                     with open(home_ui_path, "w") as f:
                         f.write(ui_json)
                         _log(f"Created default ui config at {home_ui_path}")
+                except (OSError, AttributeError) as e:
+                    _log(f"Error reading resource ui config: {e}")
+
+            # Update g_config_path to point to the copied file
+            g_config_path = home_config_path
         else:
             print("Config file not found. Create one with --init or use --config <path>")
             exit(1)
@@ -964,17 +1080,32 @@ def main():
 
         async def ui_static(request: web.Request) -> web.Response:
             path = Path(request.match_info["path"])
-            resource = _ROOT / "ui" / path
-            if not resource.is_file():
-                raise web.HTTPNotFound
+
             try:
-                resource.relative_to(Path(_ROOT)) # basic directory-traversal guard
-            except ValueError:
-                raise web.HTTPBadRequest(text="Invalid path")
-            content_type, _ = mimetypes.guess_type(resource.name)
-            if content_type is None:
-                content_type = "application/octet-stream"
-            return web.Response(body=resource.read_bytes(), content_type=content_type)
+                # Handle both Path objects and importlib.resources Traversable objects
+                if hasattr(_ROOT, 'joinpath'):
+                    # importlib.resources Traversable
+                    resource = _ROOT.joinpath("ui").joinpath(str(path))
+                    if not resource.is_file():
+                        raise web.HTTPNotFound
+                    content = resource.read_bytes()
+                else:
+                    # Regular Path object
+                    resource = _ROOT / "ui" / path
+                    if not resource.is_file():
+                        raise web.HTTPNotFound
+                    try:
+                        resource.relative_to(Path(_ROOT))  # basic directory-traversal guard
+                    except ValueError:
+                        raise web.HTTPBadRequest(text="Invalid path")
+                    content = resource.read_bytes()
+
+                content_type, _ = mimetypes.guess_type(str(path))
+                if content_type is None:
+                    content_type = "application/octet-stream"
+                return web.Response(body=content, content_type=content_type)
+            except (OSError, PermissionError, AttributeError):
+                raise web.HTTPNotFound
 
         app.router.add_get("/ui/{path:.*}", ui_static, name="ui_static")
 
@@ -983,16 +1114,15 @@ def main():
         app.router.add_get('/favicon.ico', not_found_handler)
 
         # Serve index.html from root
-        index_path = os.path.join(_ROOT, 'index.html')
-        if os.path.exists(index_path):
-            async def index_handler(request):
-                return web.FileResponse(index_path)
-            app.router.add_get('/', index_handler)
-
-            # Serve index.html as fallback route (SPA routing)
-            async def fallback_route_handler(request):
-                return web.FileResponse(index_path)
-            app.router.add_route('*', '/{tail:.*}', fallback_route_handler)
+        async def index_handler(request):
+            index_content = read_resource_file_bytes("index.html")
+            if index_content is None:
+                raise web.HTTPNotFound
+            return web.Response(body=index_content, content_type='text/html')
+        app.router.add_get('/', index_handler)
+
+        # Serve index.html as fallback route (SPA routing)
+        app.router.add_route('*', '/{tail:.*}', index_handler)
         
         if os.path.exists(g_ui_path):
             async def ui_json_handler(request):

{llms_py-2.0.3 → llms_py-2.0.5/llms_py.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llms-py
-Version: 2.0.3
+Version: 2.0.5
 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.3 → llms_py-2.0.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "llms-py"
-version = "2.0.3"
+version = "2.0.5"
 description = "A lightweight CLI tool and OpenAI-compatible server for querying multiple Large Language Model (LLM) providers"
 readme = "README.md"
 license = "BSD-3-Clause"

{llms_py-2.0.3 → llms_py-2.0.5}/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.3",
+    version="2.0.5",
     author="ServiceStack",
     author_email="team@servicestack.net",
     description="A lightweight CLI tool and OpenAI-compatible server for querying multiple Large Language Model (LLM) providers",

{llms_py-2.0.3 → llms_py-2.0.5}/ui/app.css

@@ -135,6 +135,7 @@
     --default-transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
     --default-font-family: var(--font-sans);
     --default-mono-font-family: var(--font-mono);
+    --default-ring-color: hsl(var(--ring));
   }
 }
 @layer base {