llms-py 2.0.12__py3-none-any.whl → 2.0.14__py3-none-any.whl

llms.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.12"
+VERSION = "2.0.14"
 _ROOT = None
 g_config_path = None
 g_ui_path = None
@@ -838,6 +838,7 @@ def github_url(filename):
 
 async def save_text(url, save_path):
     async with aiohttp.ClientSession() as session:
+        _log(f"GET {url}")
         async with session.get(url) as resp:
             text = await resp.text()
             if resp.status >= 400:
@@ -1110,34 +1111,61 @@ 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 resource_exists(resource_config_path):
+        if not os.path.exists(home_config_path):
             llms_home = os.path.dirname(home_config_path)
             os.makedirs(llms_home, exist_ok=True)
 
-            # 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}")
-            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):
+            if resource_exists(resource_config_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}")
+                    # Read config from resource (handle both Path and Traversable objects)
+                    config_json = read_resource_text(resource_ui_path)
                 except (OSError, AttributeError) as e:
-                    _log(f"Error reading resource ui config: {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))
+                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>")
+                    exit(1)
 
+            with open(home_config_path, "w") as f:
+                f.write(config_json)
+                _log(f"Created default config at {home_config_path}")
             # 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)
+    if not g_config_path or not os.path.exists(g_config_path):
+        print("llms.json not found. Create one with --init or use --config <path>")
+        exit(1)
+
+    if not g_ui_path or not os.path.exists(g_ui_path):
+        # Read UI config from resource
+        if not os.path.exists(home_ui_path):
+            llms_home = os.path.dirname(home_ui_path)
+            os.makedirs(llms_home, exist_ok=True)
+            if resource_exists(resource_ui_path):
+                try:
+                    # Read config from resource (handle both Path and Traversable objects)
+                    ui_json = read_resource_text(resource_ui_path)
+                except (OSError, AttributeError) as e:
+                    _log(f"Error reading resource ui config: {e}")
+            if not ui_json:
+                try:
+                    ui_json = asyncio.run(save_text(github_url("ui.json"), home_ui_path))
+                except Exception as e:
+                    _log(f"Error downloading ui.json: {e}")
+                    print("Could not create ui.json. Create one with --init or use --config <path>")
+                    exit(1)
+
+            with open(home_ui_path, "w") as f:
+                f.write(ui_json)
+                _log(f"Created default ui config at {home_ui_path}")
+        
+        # Update g_config_path to point to the copied file
+        g_ui_path = home_ui_path
+    if not g_ui_path or not os.path.exists(g_ui_path):
+        print("ui.json not found. Create one with --init or use --config <path>")
+        exit(1)
 
     # read contents
     with open(g_config_path, "r") as f:
@@ -1173,6 +1201,10 @@ def main():
     if cli_args.serve is not None:
         port = int(cli_args.serve)
 
+        if not os.path.exists(g_ui_path):
+            print(f"UI not found at {g_ui_path}")
+            exit(1)
+
         app = web.Application()
 
         async def chat_handler(request):
@@ -1247,6 +1279,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)
@@ -1262,24 +1308,9 @@ def main():
 
         # 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_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:

{llms_py-2.0.12.data → llms_py-2.0.14.data}/data/ui/ai.mjs

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

{llms_py-2.0.12.dist-info → llms_py-2.0.14.dist-info}/METADATA

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

@@ -0,0 +1,40 @@
+llms.py,sha256=bh_8AmA4fPNdE_9oOjJrrAnPlKNeoKyDmE9Buq8iV5c,60500
+llms_py-2.0.14.data/data/index.html,sha256=RmvPW7H49tHR3DdQvvSrcR_OeCt1InYd5dirBxfZCpo,2417
+llms_py-2.0.14.data/data/llms.json,sha256=aQFm_lXsPLTWCndE2DNhTY04P576U7NFN9hx5-QwL3E,19582
+llms_py-2.0.14.data/data/requirements.txt,sha256=iv-JIaacmTl-hSho3QmphcKnbRRYx1st47yjz_178Ro,8
+llms_py-2.0.14.data/data/ui.json,sha256=iBOmpNeD5-o8AgUa51ymS-KemovJ7bm9J1fnL0nf8jk,134025
+llms_py-2.0.14.data/data/ui/App.mjs,sha256=hXtUjaL3GrcIHieEK3BzIG72OVzrorBBS4RkE1DOGc4,439
+llms_py-2.0.14.data/data/ui/Avatar.mjs,sha256=3rHpxe_LuCDiNP895F3FOjWx4j377JA9rD1FLluvtgA,851
+llms_py-2.0.14.data/data/ui/Brand.mjs,sha256=ZkJ1Yd9ZgdTbs7f3ezM0UtsHMcm6v4-L-m3avnSXAXU,1184
+llms_py-2.0.14.data/data/ui/ChatPrompt.mjs,sha256=IbfCx3W0SlX8x9lvaFjB1rqJqNkbeUvfqFHP9iKzZ9s,19776
+llms_py-2.0.14.data/data/ui/Main.mjs,sha256=kLNWyXWUgHAaX3C3kVkAHOLvEI3H4bd5k9yMkUIRQPU,27348
+llms_py-2.0.14.data/data/ui/ModelSelector.mjs,sha256=qiI-7DBwif5ipNZtzgaZQ2o_wHc23dBRMY6zVkMOCak,947
+llms_py-2.0.14.data/data/ui/ProviderStatus.mjs,sha256=qF_rPdhyt9GffKdPCJdU0yanrDJ3cw1HLPygFP_KjEs,5744
+llms_py-2.0.14.data/data/ui/Recents.mjs,sha256=hmj7V-RXVw-DqMXjUr3OhFHTYQTkvkEhuNEDTGBf3Qw,8448
+llms_py-2.0.14.data/data/ui/SettingsDialog.mjs,sha256=Jm21s5CcZT97ZEhPc7c1WgnLOLdfSiC1SDroYsh7zM4,18095
+llms_py-2.0.14.data/data/ui/Sidebar.mjs,sha256=ERm2Q7pftKTHLCjf-Q76joy1dsvtNWLoYH-wO2mS1LI,9781
+llms_py-2.0.14.data/data/ui/SignIn.mjs,sha256=df3b-7L3ZIneDGbJWUk93K9RGo40gVeuR5StzT1ZH9g,2324
+llms_py-2.0.14.data/data/ui/SystemPromptEditor.mjs,sha256=2CyIUvkIubqYPyIp5zC6_I8CMxvYINuYNjDxvMz4VRU,1265
+llms_py-2.0.14.data/data/ui/SystemPromptSelector.mjs,sha256=AuEtRwUf_RkGgene3nVA9bw8AeMb-b5_6ZLJCTWA8KQ,3051
+llms_py-2.0.14.data/data/ui/Welcome.mjs,sha256=QFAxN7sjWlhMvOIJCmHjNFCQcvpM_T-b4ze1ld9Hj7I,912
+llms_py-2.0.14.data/data/ui/ai.mjs,sha256=mQpBHkU8jp0DO0vtdkVujzWJcC04SDpobutk3sWVgto,2346
+llms_py-2.0.14.data/data/ui/app.css,sha256=1Z4coREGsjMw7lYabejdaG0ZMwPpP5lmjRHRDYygq-g,94964
+llms_py-2.0.14.data/data/ui/fav.svg,sha256=_R6MFeXl6wBFT0lqcUxYQIDWgm246YH_3hSTW0oO8qw,734
+llms_py-2.0.14.data/data/ui/markdown.mjs,sha256=O5UspOeD8-E23rxOLWcS4eyy2YejMbPwszCYteVtuoU,6221
+llms_py-2.0.14.data/data/ui/tailwind.input.css,sha256=P6QxCwbTBAaG2079ddgtFuuXDLIztEkJDFwj0wmOvkk,11978
+llms_py-2.0.14.data/data/ui/threadStore.mjs,sha256=nM53p1E78Jc7tPOoyS3J3SW9F1njcZ-Fw5FlR9l-3yY,7215
+llms_py-2.0.14.data/data/ui/typography.css,sha256=Z5Fe2IQWnh7bu1CMXniYt0SkaN2fXOFlOuniXUW8oGM,19325
+llms_py-2.0.14.data/data/ui/utils.mjs,sha256=UKyaBsuJYEc-MWoL9b1M5-t3x6h5_HV9HsNBoDVtBRw,4226
+llms_py-2.0.14.data/data/ui/lib/highlight.min.mjs,sha256=sG7wq8bF-IKkfie7S4QSyh5DdHBRf0NqQxMOEH8-MT0,127458
+llms_py-2.0.14.data/data/ui/lib/idb.min.mjs,sha256=CeTXyV4I_pB5vnibvJuyXdMs0iVF2ZL0Z7cdm3w_QaI,3853
+llms_py-2.0.14.data/data/ui/lib/marked.min.mjs,sha256=QRHb_VZugcBJRD2EP6gYlVFEsJw5C2fQ8ImMf_pA2_s,39488
+llms_py-2.0.14.data/data/ui/lib/servicestack-client.mjs,sha256=UVafVbzhJ_0N2lzv7rlzIbzwnWpoqXxGk3N3FSKgOOc,54534
+llms_py-2.0.14.data/data/ui/lib/servicestack-vue.mjs,sha256=r_-khYokisXJAIPDLh8Wq6YtcLAY6HNjtJlCZJjLy74,215181
+llms_py-2.0.14.data/data/ui/lib/vue-router.min.mjs,sha256=fR30GHoXI1u81zyZ26YEU105pZgbbAKSXbpnzFKIxls,30418
+llms_py-2.0.14.data/data/ui/lib/vue.min.mjs,sha256=iXh97m5hotl0eFllb3aoasQTImvp7mQoRJ_0HoxmZkw,163811
+llms_py-2.0.14.dist-info/licenses/LICENSE,sha256=rRryrddGfVftpde-rmAZpW0R8IJihqJ8t8wpfDXoKiQ,1549
+llms_py-2.0.14.dist-info/METADATA,sha256=zyBLBoDwdXrK2ZZT14e3kfDyKR0I3kZF6uEq2KZJ5xY,28351
+llms_py-2.0.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+llms_py-2.0.14.dist-info/entry_points.txt,sha256=svUoTt28bIJeo6Mb1ffDBLyzhD90DWtFbfp0ShyRCgU,35
+llms_py-2.0.14.dist-info/top_level.txt,sha256=gC7hk9BKSeog8gyg-EM_g2gxm1mKHwFRfK-10BxOsa4,5
+llms_py-2.0.14.dist-info/RECORD,,

llms_py-2.0.12.dist-info/RECORD

@@ -1,40 +0,0 @@
-llms.py,sha256=P6Lu9lHPujMd4HwXrx4_pJic6ye4cGps0lFf5X-f85c,59146
-llms_py-2.0.12.data/data/index.html,sha256=RmvPW7H49tHR3DdQvvSrcR_OeCt1InYd5dirBxfZCpo,2417
-llms_py-2.0.12.data/data/llms.json,sha256=aQFm_lXsPLTWCndE2DNhTY04P576U7NFN9hx5-QwL3E,19582
-llms_py-2.0.12.data/data/requirements.txt,sha256=iv-JIaacmTl-hSho3QmphcKnbRRYx1st47yjz_178Ro,8
-llms_py-2.0.12.data/data/ui.json,sha256=iBOmpNeD5-o8AgUa51ymS-KemovJ7bm9J1fnL0nf8jk,134025
-llms_py-2.0.12.data/data/ui/App.mjs,sha256=hXtUjaL3GrcIHieEK3BzIG72OVzrorBBS4RkE1DOGc4,439
-llms_py-2.0.12.data/data/ui/Avatar.mjs,sha256=3rHpxe_LuCDiNP895F3FOjWx4j377JA9rD1FLluvtgA,851
-llms_py-2.0.12.data/data/ui/Brand.mjs,sha256=ZkJ1Yd9ZgdTbs7f3ezM0UtsHMcm6v4-L-m3avnSXAXU,1184
-llms_py-2.0.12.data/data/ui/ChatPrompt.mjs,sha256=IbfCx3W0SlX8x9lvaFjB1rqJqNkbeUvfqFHP9iKzZ9s,19776
-llms_py-2.0.12.data/data/ui/Main.mjs,sha256=kLNWyXWUgHAaX3C3kVkAHOLvEI3H4bd5k9yMkUIRQPU,27348
-llms_py-2.0.12.data/data/ui/ModelSelector.mjs,sha256=qiI-7DBwif5ipNZtzgaZQ2o_wHc23dBRMY6zVkMOCak,947
-llms_py-2.0.12.data/data/ui/ProviderStatus.mjs,sha256=qF_rPdhyt9GffKdPCJdU0yanrDJ3cw1HLPygFP_KjEs,5744
-llms_py-2.0.12.data/data/ui/Recents.mjs,sha256=hmj7V-RXVw-DqMXjUr3OhFHTYQTkvkEhuNEDTGBf3Qw,8448
-llms_py-2.0.12.data/data/ui/SettingsDialog.mjs,sha256=Jm21s5CcZT97ZEhPc7c1WgnLOLdfSiC1SDroYsh7zM4,18095
-llms_py-2.0.12.data/data/ui/Sidebar.mjs,sha256=ERm2Q7pftKTHLCjf-Q76joy1dsvtNWLoYH-wO2mS1LI,9781
-llms_py-2.0.12.data/data/ui/SignIn.mjs,sha256=df3b-7L3ZIneDGbJWUk93K9RGo40gVeuR5StzT1ZH9g,2324
-llms_py-2.0.12.data/data/ui/SystemPromptEditor.mjs,sha256=2CyIUvkIubqYPyIp5zC6_I8CMxvYINuYNjDxvMz4VRU,1265
-llms_py-2.0.12.data/data/ui/SystemPromptSelector.mjs,sha256=AuEtRwUf_RkGgene3nVA9bw8AeMb-b5_6ZLJCTWA8KQ,3051
-llms_py-2.0.12.data/data/ui/Welcome.mjs,sha256=QFAxN7sjWlhMvOIJCmHjNFCQcvpM_T-b4ze1ld9Hj7I,912
-llms_py-2.0.12.data/data/ui/ai.mjs,sha256=tGAENGWY3gxn6j0_SqDTX14-rKdAlXsmAMQ9Mz2lUcw,2346
-llms_py-2.0.12.data/data/ui/app.css,sha256=1Z4coREGsjMw7lYabejdaG0ZMwPpP5lmjRHRDYygq-g,94964
-llms_py-2.0.12.data/data/ui/fav.svg,sha256=_R6MFeXl6wBFT0lqcUxYQIDWgm246YH_3hSTW0oO8qw,734
-llms_py-2.0.12.data/data/ui/markdown.mjs,sha256=O5UspOeD8-E23rxOLWcS4eyy2YejMbPwszCYteVtuoU,6221
-llms_py-2.0.12.data/data/ui/tailwind.input.css,sha256=P6QxCwbTBAaG2079ddgtFuuXDLIztEkJDFwj0wmOvkk,11978
-llms_py-2.0.12.data/data/ui/threadStore.mjs,sha256=nM53p1E78Jc7tPOoyS3J3SW9F1njcZ-Fw5FlR9l-3yY,7215
-llms_py-2.0.12.data/data/ui/typography.css,sha256=Z5Fe2IQWnh7bu1CMXniYt0SkaN2fXOFlOuniXUW8oGM,19325
-llms_py-2.0.12.data/data/ui/utils.mjs,sha256=UKyaBsuJYEc-MWoL9b1M5-t3x6h5_HV9HsNBoDVtBRw,4226
-llms_py-2.0.12.data/data/ui/lib/highlight.min.mjs,sha256=sG7wq8bF-IKkfie7S4QSyh5DdHBRf0NqQxMOEH8-MT0,127458
-llms_py-2.0.12.data/data/ui/lib/idb.min.mjs,sha256=CeTXyV4I_pB5vnibvJuyXdMs0iVF2ZL0Z7cdm3w_QaI,3853
-llms_py-2.0.12.data/data/ui/lib/marked.min.mjs,sha256=QRHb_VZugcBJRD2EP6gYlVFEsJw5C2fQ8ImMf_pA2_s,39488
-llms_py-2.0.12.data/data/ui/lib/servicestack-client.mjs,sha256=UVafVbzhJ_0N2lzv7rlzIbzwnWpoqXxGk3N3FSKgOOc,54534
-llms_py-2.0.12.data/data/ui/lib/servicestack-vue.mjs,sha256=r_-khYokisXJAIPDLh8Wq6YtcLAY6HNjtJlCZJjLy74,215181
-llms_py-2.0.12.data/data/ui/lib/vue-router.min.mjs,sha256=fR30GHoXI1u81zyZ26YEU105pZgbbAKSXbpnzFKIxls,30418
-llms_py-2.0.12.data/data/ui/lib/vue.min.mjs,sha256=iXh97m5hotl0eFllb3aoasQTImvp7mQoRJ_0HoxmZkw,163811
-llms_py-2.0.12.dist-info/licenses/LICENSE,sha256=rRryrddGfVftpde-rmAZpW0R8IJihqJ8t8wpfDXoKiQ,1549
-llms_py-2.0.12.dist-info/METADATA,sha256=S545zYZs-obRPtHMHN8g4mVr2D9DAz21wF6Avo3GDEk,28351
-llms_py-2.0.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-llms_py-2.0.12.dist-info/entry_points.txt,sha256=svUoTt28bIJeo6Mb1ffDBLyzhD90DWtFbfp0ShyRCgU,35
-llms_py-2.0.12.dist-info/top_level.txt,sha256=gC7hk9BKSeog8gyg-EM_g2gxm1mKHwFRfK-10BxOsa4,5
-llms_py-2.0.12.dist-info/RECORD,,