llms-py 2.0.0__tar.gz → 2.0.1__tar.gz

{llms_py-2.0.0/llms_py.egg-info → llms_py-2.0.1}/PKG-INFO

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

@@ -16,7 +16,10 @@ import traceback
 import aiohttp
 from aiohttp import web
 
-VERSION = "2.0.0"
+from pathlib import Path
+from importlib import resources   # Py≥3.9  (pip install importlib_resources for 3.7/3.8)
+
+VERSION = "2.0.1"
 g_config_path = None
 g_ui_path = None
 g_config = None
@@ -782,6 +785,7 @@ def disable_provider(provider):
     save_config(g_config)
     init_llms(g_config)
 
+
 def main():
     global g_verbose, g_default_model, g_logprefix, g_config_path, g_ui_path
 
@@ -822,18 +826,29 @@ 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-py")
+    except ModuleNotFoundError:                       # package not installed
+        # __file__ is *this* module; climb two levels to repo root
+        _ROOT = Path(__file__).resolve().parent.parent / "llms"
+        _log(f"ROOT: {_ROOT}")
+
     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()
 
+    home_config_path = home_llms_path("llms.json")
+    resource_config_path = _ROOT / "llms.json"
+    home_ui_path = home_llms_path("ui.json")
+    resource_ui_path = _ROOT / "ui.json"
+
     if cli_args.init:
-        home_config_path = home_llms_path("llms.json")
         if os.path.exists(home_config_path):
             print(f"llms.json already exists at {home_config_path}")
         else:
             asyncio.run(save_default_config(home_config_path))
             print(f"Created default config at {home_config_path}")
 
-        home_ui_path = home_llms_path("ui.json")
         if os.path.exists(home_ui_path):
             print(f"ui.json already exists at {home_ui_path}")
         else:
@@ -841,9 +856,26 @@ def main():
             print(f"Created default ui config at {home_ui_path}")
         exit(0)
 
-    if not os.path.exists(g_config_path):
-        print("Config file not found. Create one with --init or use --config <path>")
-        exit(1)
+    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):
+            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()
+                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()
+                    with open(home_ui_path, "w") as f:
+                        f.write(ui_json)
+                        _log(f"Created default ui config at {home_ui_path}")
+        else:
+            print("Config file not found. Create one with --init or use --config <path>")
+            exit(1)
 
     # read contents
     with open(g_config_path, "r") as f:
@@ -923,18 +955,28 @@ def main():
             })
         app.router.add_post('/providers/{provider}', provider_handler)
 
-        # Serve static files from ui/ directory
-        script_dir = os.path.dirname(os.path.abspath(__file__))
-        ui_path = os.path.join(script_dir, 'ui')
-        if os.path.exists(ui_path):
-            app.router.add_static('/ui/', ui_path, name='ui')
+        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)
+
+        app.router.add_get("/ui/{path:.*}", ui_static, name="ui_static")
 
         async def not_found_handler(request):
             return web.Response(text="404: Not Found", status=404)
         app.router.add_get('/favicon.ico', not_found_handler)
 
         # Serve index.html from root
-        index_path = os.path.join(script_dir, 'index.html')
+        index_path = os.path.join(_ROOT, 'index.html')
         if os.path.exists(index_path):
             async def index_handler(request):
                 return web.FileResponse(index_path)

{llms_py-2.0.0 → llms_py-2.0.1/llms_py.egg-info}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "llms-py"
-version = "2.0.0"
+version = "2.0.1"
 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.0 → llms_py-2.0.1}/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.0",
+    version="2.0.1",
     author="ServiceStack",
     author_email="team@servicestack.net",
     description="A lightweight CLI tool and OpenAI-compatible server for querying multiple Large Language Model (LLM) providers",