llms-py 2.0.0__py3-none-any.whl → 2.0.2__py3-none-any.whl

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.2"
 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
 
@@ -806,6 +810,7 @@ def main():
 
     parser.add_argument('--init',         action='store_true', help='Create a default llms.json')
 
+    parser.add_argument('--root',         default=None, help='Change root directory for UI files', metavar='PATH')
     parser.add_argument('--logprefix',    default="",   help='Prefix used in log messages', metavar='PREFIX')
     parser.add_argument('--verbose',      action='store_true', help='Verbose output')
     parser.add_argument('--update',       action='store_true', help='Update to latest version')
@@ -822,18 +827,35 @@ 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}")
+
+    if cli_args.root:
+        _ROOT = Path(cli_args.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 +863,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 +962,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.dist-info → llms_py-2.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llms-py
-Version: 2.0.0
+Version: 2.0.2
 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.2.dist-info/RECORD

@@ -0,0 +1,30 @@
+llms.py,sha256=idCn0aVSvktEd1PIrvwwfzbUpKuVLAPr705XNZNW0m4,47263
+llms_py-2.0.2.data/data/index.html,sha256=nOgYc7t9QjlbRoy35-W6HpQbEEuD0-O1rkA8j-IYhZ4,2276
+llms_py-2.0.2.data/data/llms.json,sha256=nw9g63Ht15V5h2A9ynx8_1KLLboNrzUN5PTPhPV1lAY,18365
+llms_py-2.0.2.data/data/requirements.txt,sha256=iv-JIaacmTl-hSho3QmphcKnbRRYx1st47yjz_178Ro,8
+llms_py-2.0.2.data/data/ui.json,sha256=iBOmpNeD5-o8AgUa51ymS-KemovJ7bm9J1fnL0nf8jk,134025
+llms_py-2.0.2.data/data/ui/App.mjs,sha256=hXtUjaL3GrcIHieEK3BzIG72OVzrorBBS4RkE1DOGc4,439
+llms_py-2.0.2.data/data/ui/ChatPrompt.mjs,sha256=S_p2h6CJUDMvuetMgauJzS0MkACDw-bWw0FR-YXre_w,17163
+llms_py-2.0.2.data/data/ui/Main.mjs,sha256=8RdjDDCQSwk4wjRolJIkbWvHZHRf1GB9Qj8zN1lyuHo,26714
+llms_py-2.0.2.data/data/ui/Recents.mjs,sha256=cA9njbuOXeTWWagiArmswwgXuAV36ExhXGPE6sZrffY,7459
+llms_py-2.0.2.data/data/ui/Sidebar.mjs,sha256=TUyicSr8MRpLoUZoQ6neBG0PwhFcz2BhIQVwdaKSuo8,10870
+llms_py-2.0.2.data/data/ui/app.css,sha256=E_UzowGq5lYcvSnHy-KgSsQV_LB6HPr989lpp6YHlug,92441
+llms_py-2.0.2.data/data/ui/fav.svg,sha256=_R6MFeXl6wBFT0lqcUxYQIDWgm246YH_3hSTW0oO8qw,734
+llms_py-2.0.2.data/data/ui/markdown.mjs,sha256=YeOnS7bPM0oyXHMVsgwobLYKgqzRNjrmBJ8NIrhU9Z8,6096
+llms_py-2.0.2.data/data/ui/tailwind.input.css,sha256=31O3JLwvf8qPoEmKAGMPXEOgVRNcP7i7Y0DH_xw6qsg,10612
+llms_py-2.0.2.data/data/ui/threadStore.mjs,sha256=bL-yPx1ShU7lBJrzgMHI7K-ZtzcuWDSjtSf--nn0DVk,7199
+llms_py-2.0.2.data/data/ui/typography.css,sha256=XtIOwBvWujwTOSOuF-zs5x3xEJLnmg27q2lmv4JyLm4,16127
+llms_py-2.0.2.data/data/ui/utils.mjs,sha256=exyN-YohPvcGSR-IrjYUj0t3_RDIrnaJgSvkHA2bIRk,4016
+llms_py-2.0.2.data/data/ui/lib/highlight.min.mjs,sha256=sG7wq8bF-IKkfie7S4QSyh5DdHBRf0NqQxMOEH8-MT0,127458
+llms_py-2.0.2.data/data/ui/lib/idb.min.mjs,sha256=CeTXyV4I_pB5vnibvJuyXdMs0iVF2ZL0Z7cdm3w_QaI,3853
+llms_py-2.0.2.data/data/ui/lib/marked.min.mjs,sha256=QRHb_VZugcBJRD2EP6gYlVFEsJw5C2fQ8ImMf_pA2_s,39488
+llms_py-2.0.2.data/data/ui/lib/servicestack-client.min.mjs,sha256=UVafVbzhJ_0N2lzv7rlzIbzwnWpoqXxGk3N3FSKgOOc,54534
+llms_py-2.0.2.data/data/ui/lib/servicestack-vue.min.mjs,sha256=oqeaDTgQxCi4gLt9X0J8UwIJgW9FWCV0d-Iiak6k-qI,218926
+llms_py-2.0.2.data/data/ui/lib/vue-router.min.mjs,sha256=fR30GHoXI1u81zyZ26YEU105pZgbbAKSXbpnzFKIxls,30418
+llms_py-2.0.2.data/data/ui/lib/vue.min.mjs,sha256=iXh97m5hotl0eFllb3aoasQTImvp7mQoRJ_0HoxmZkw,163811
+llms_py-2.0.2.dist-info/licenses/LICENSE,sha256=rRryrddGfVftpde-rmAZpW0R8IJihqJ8t8wpfDXoKiQ,1549
+llms_py-2.0.2.dist-info/METADATA,sha256=MuCK5DkzROO_wVNrMOCorRevw7ap36BCiGGvPlL87sI,23652
+llms_py-2.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+llms_py-2.0.2.dist-info/entry_points.txt,sha256=svUoTt28bIJeo6Mb1ffDBLyzhD90DWtFbfp0ShyRCgU,35
+llms_py-2.0.2.dist-info/top_level.txt,sha256=gC7hk9BKSeog8gyg-EM_g2gxm1mKHwFRfK-10BxOsa4,5
+llms_py-2.0.2.dist-info/RECORD,,

llms_py-2.0.0.dist-info/RECORD

@@ -1,30 +0,0 @@
-llms.py,sha256=MpIinC5Dd_s6psCUCVY_cOVGAsxmD1Z2zo_cNhJdvR0,45065
-llms_py-2.0.0.data/data/index.html,sha256=nOgYc7t9QjlbRoy35-W6HpQbEEuD0-O1rkA8j-IYhZ4,2276
-llms_py-2.0.0.data/data/llms.json,sha256=nw9g63Ht15V5h2A9ynx8_1KLLboNrzUN5PTPhPV1lAY,18365
-llms_py-2.0.0.data/data/requirements.txt,sha256=iv-JIaacmTl-hSho3QmphcKnbRRYx1st47yjz_178Ro,8
-llms_py-2.0.0.data/data/ui.json,sha256=iBOmpNeD5-o8AgUa51ymS-KemovJ7bm9J1fnL0nf8jk,134025
-llms_py-2.0.0.data/data/ui/App.mjs,sha256=hXtUjaL3GrcIHieEK3BzIG72OVzrorBBS4RkE1DOGc4,439
-llms_py-2.0.0.data/data/ui/ChatPrompt.mjs,sha256=S_p2h6CJUDMvuetMgauJzS0MkACDw-bWw0FR-YXre_w,17163
-llms_py-2.0.0.data/data/ui/Main.mjs,sha256=8RdjDDCQSwk4wjRolJIkbWvHZHRf1GB9Qj8zN1lyuHo,26714
-llms_py-2.0.0.data/data/ui/Recents.mjs,sha256=cA9njbuOXeTWWagiArmswwgXuAV36ExhXGPE6sZrffY,7459
-llms_py-2.0.0.data/data/ui/Sidebar.mjs,sha256=TUyicSr8MRpLoUZoQ6neBG0PwhFcz2BhIQVwdaKSuo8,10870
-llms_py-2.0.0.data/data/ui/app.css,sha256=E_UzowGq5lYcvSnHy-KgSsQV_LB6HPr989lpp6YHlug,92441
-llms_py-2.0.0.data/data/ui/fav.svg,sha256=_R6MFeXl6wBFT0lqcUxYQIDWgm246YH_3hSTW0oO8qw,734
-llms_py-2.0.0.data/data/ui/markdown.mjs,sha256=YeOnS7bPM0oyXHMVsgwobLYKgqzRNjrmBJ8NIrhU9Z8,6096
-llms_py-2.0.0.data/data/ui/tailwind.input.css,sha256=31O3JLwvf8qPoEmKAGMPXEOgVRNcP7i7Y0DH_xw6qsg,10612
-llms_py-2.0.0.data/data/ui/threadStore.mjs,sha256=bL-yPx1ShU7lBJrzgMHI7K-ZtzcuWDSjtSf--nn0DVk,7199
-llms_py-2.0.0.data/data/ui/typography.css,sha256=XtIOwBvWujwTOSOuF-zs5x3xEJLnmg27q2lmv4JyLm4,16127
-llms_py-2.0.0.data/data/ui/utils.mjs,sha256=exyN-YohPvcGSR-IrjYUj0t3_RDIrnaJgSvkHA2bIRk,4016
-llms_py-2.0.0.data/data/ui/lib/highlight.min.mjs,sha256=sG7wq8bF-IKkfie7S4QSyh5DdHBRf0NqQxMOEH8-MT0,127458
-llms_py-2.0.0.data/data/ui/lib/idb.min.mjs,sha256=CeTXyV4I_pB5vnibvJuyXdMs0iVF2ZL0Z7cdm3w_QaI,3853
-llms_py-2.0.0.data/data/ui/lib/marked.min.mjs,sha256=QRHb_VZugcBJRD2EP6gYlVFEsJw5C2fQ8ImMf_pA2_s,39488
-llms_py-2.0.0.data/data/ui/lib/servicestack-client.min.mjs,sha256=UVafVbzhJ_0N2lzv7rlzIbzwnWpoqXxGk3N3FSKgOOc,54534
-llms_py-2.0.0.data/data/ui/lib/servicestack-vue.min.mjs,sha256=oqeaDTgQxCi4gLt9X0J8UwIJgW9FWCV0d-Iiak6k-qI,218926
-llms_py-2.0.0.data/data/ui/lib/vue-router.min.mjs,sha256=fR30GHoXI1u81zyZ26YEU105pZgbbAKSXbpnzFKIxls,30418
-llms_py-2.0.0.data/data/ui/lib/vue.min.mjs,sha256=iXh97m5hotl0eFllb3aoasQTImvp7mQoRJ_0HoxmZkw,163811
-llms_py-2.0.0.dist-info/licenses/LICENSE,sha256=rRryrddGfVftpde-rmAZpW0R8IJihqJ8t8wpfDXoKiQ,1549
-llms_py-2.0.0.dist-info/METADATA,sha256=wu4I6AJ1Sq01_YleiZztaYFcqWSfvsare59-ANXMYYI,23652
-llms_py-2.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-llms_py-2.0.0.dist-info/entry_points.txt,sha256=svUoTt28bIJeo6Mb1ffDBLyzhD90DWtFbfp0ShyRCgU,35
-llms_py-2.0.0.dist-info/top_level.txt,sha256=gC7hk9BKSeog8gyg-EM_g2gxm1mKHwFRfK-10BxOsa4,5
-llms_py-2.0.0.dist-info/RECORD,,