kalavai-client 0.6.2__py3-none-any.whl → 0.6.3__py3-none-any.whl

kalavai_client/__init__.py

@@ -1,2 +1,2 @@
 
-__version__ = "0.6.2"
+__version__ = "0.6.3"

kalavai_client/assets/docker-compose-template.yaml

@@ -14,49 +14,6 @@ services:
       - /dev/net/tun:/dev/net/tun
     restart: unless-stopped
 {% endif %}
-{% if backend %}
-  backend:
-    image: docker.io/bundenth/kalavai-backend:latest
-    container_name: backend
-    networks:
-    - kalavai-net
-    ports:
-    - "{{bridge_port | default(8001)}}:{{bridge_port | default(8001)}}"
-    command: >
-      backend
-      start
-      --bridge-port {{bridge_port | default(8001)}}
-    environment:
-      - KALAVAI_PATH=/root/.cache/kalavai
-    volumes:
-      - "{{user_path}}:/root/.cache/kalavai"
-    restart: unless-stopped
-{% endif %}
-{% if frontend %}
-  frontend:
-    container_name: frontend
-    image: bundenth/kalavai-gui:latest
-    networks:
-    - kalavai-net
-    environment:
-    - KALAVAI_BRIDGE_URL=http://backend
-    - KALAVAI_BRIDGE_PORT={{bridge_port | default(8001)}}
-    {% if protected_access %}
-    - ACCESS_KEY={{protected_access}}
-    {% endif %}
-    entrypoint: ["reflex"]
-    command: >
-      run
-      --backend-port {{gui_backend_port | default(8002)}}
-      --frontend-port {{gui_frontend_port | default(3000)}}
-    ports:
-    - "{{gui_backend_port | default(8002)}}:{{gui_backend_port | default(8002)}}"
-    - "{{gui_frontend_port | default(3000)}}:{{gui_frontend_port | default(3000)}}"
-    volumes:
-      - "{{user_path}}:/root/.cache/kalavai"
-    restart: unless-stopped
-{% endif %}
-
 # run worker only if command is set
 {%if command %}
   {{service_name}}:
@@ -107,7 +64,3 @@ services:
             capabilities: [gpu]
   {% endif %}
 {% endif %}
-
-networks:
-  kalavai-net:
-    driver: bridge

kalavai_client/cli.py

@@ -209,50 +209,42 @@ def gui__start(
     gui_backend_port=8000,
     bridge_port=8001,
     log_level="critical",
-    protected_access=False
+    protected_access=False,
+    backend_only=False
 ):
     """Run GUI (docker) and kalavai core backend (api)"""
     if len(set([gui_frontend_port, gui_backend_port, bridge_port])) < 3:
         console.log("[red]Error: ports must be unique")
         return
     
-    user_key = None
-    if protected_access:
-        user_key = load_user_id()
-        if user_key is None:
-            console.log("[red]Error: user key not found (required for protected access)")
-            return
-    
-    values = {
-        "gui_frontend_port": gui_frontend_port,
-        "gui_backend_port": gui_backend_port,
-        "bridge_port": bridge_port,
-        "path": user_path("", create_path=True),
-        "protected_access": user_key
+    user_key = load_user_id()
+    if user_key is not None:
+        console.log(f"[green]Using user key: {user_key}")
+    if not backend_only:
+        values = {
+            "gui_frontend_port": gui_frontend_port,
+            "gui_backend_port": gui_backend_port,
+            "bridge_port": bridge_port,
+            "path": user_path("", create_path=True),
+            "protected_access": user_key
     }
-    compose_yaml = load_template(
-        template_path=DOCKER_COMPOSE_GUI,
-        values=values)
-    with open(USER_GUI_COMPOSE_FILE, "w") as f:
-        f.write(compose_yaml)
-    
-    run_cmd(f"docker compose --file {USER_GUI_COMPOSE_FILE} up -d")
+        compose_yaml = load_template(
+            template_path=DOCKER_COMPOSE_GUI,
+            values=values)
+        with open(USER_GUI_COMPOSE_FILE, "w") as f:
+            f.write(compose_yaml)
+        
+        run_cmd(f"docker compose --file {USER_GUI_COMPOSE_FILE} up -d")
 
-    console.log(f"[green]Loading GUI, may take a few minutes. It will be available at http://localhost:{gui_frontend_port}")
+        console.log(f"[green]Loading GUI, may take a few minutes. It will be available at http://localhost:{gui_frontend_port}")
     print(
         "Deploying bridge API"
     )
     run_api(port=bridge_port, log_level=log_level)
-    run_cmd(f"docker compose --file {USER_GUI_COMPOSE_FILE} down")
-    console.log("[green]Kalavai GUI has been stopped")
 
-@arguably.command
-def backend__start(*others, bridge_port=8001, log_level="critical"):
-    """
-    Start the Kalavai backend
-    """
-    run_api(port=bridge_port, log_level=log_level)
-    console.log("[green]Kalavai backend has been stopped")
+    if not backend_only:
+        run_cmd(f"docker compose --file {USER_GUI_COMPOSE_FILE} down")
+        console.log("[green]Kalavai GUI has been stopped")
 
 @arguably.command
 def auth(user_key, *others):

kalavai_client/core.py

@@ -573,9 +573,7 @@ def attach_to_pool(token, node_name=None):
     generate_compose_config(
         role="",
         vpn_token=public_location,
-        node_name=node_name,
-        backend=True,
-        frontend=True)
+        node_name=node_name)
     
     store_server_info(
         server_ip=kalavai_seed_ip,
@@ -639,9 +637,7 @@ def generate_worker_package(num_gpus=0, node_name=None, ip_address="0.0.0.0", st
         num_gpus=num_gpus,
         vpn_token=public_location,
         node_name=node_name,
-        node_labels=node_labels,
-        backend=False,
-        frontend=False)
+        node_labels=node_labels)
     
     return compose
 
@@ -688,9 +684,7 @@ def join_pool(token, num_gpus=None, node_name=None, ip_address=None):
         num_gpus=num_gpus,
         vpn_token=public_location,
         node_name=node_name,
-        node_labels=node_labels,
-        backend=True,
-        frontend=True)
+        node_labels=node_labels)
     
     store_server_info(
         server_ip=kalavai_seed_ip,
@@ -776,10 +770,7 @@ def create_pool(
         node_ip_address=ip_address,
         num_gpus=num_gpus,
         node_name=node_name,
-        node_labels=node_labels,
-        backend=True,
-        frontend=True,
-        user_id=user_id
+        node_labels=node_labels
     )
     
     # start server

kalavai_client/utils.py

@@ -100,7 +100,7 @@ def is_storage_compatible():
         return False
 ################
 
-def generate_compose_config(role, node_name, write_to_file=True, node_ip_address="0.0.0.0", num_gpus=0, node_labels=None, pool_ip=None, vpn_token=None, pool_token=None, user_id=None, backend=True, frontend=True):
+def generate_compose_config(role, node_name, write_to_file=True, node_ip_address="0.0.0.0", num_gpus=0, node_labels=None, pool_ip=None, vpn_token=None, pool_token=None):
     
     if node_labels is not None:
         node_labels = " ".join([f"--node-label {key}={value}" for key, value in node_labels.items()])
@@ -121,10 +121,7 @@ def generate_compose_config(role, node_name, write_to_file=True, node_ip_address
         "k3s_path": f"{CONTAINER_HOST_PATH}/{rand_suffix}/k3s",
         "etc_path": f"{CONTAINER_HOST_PATH}/{rand_suffix}/etc",
         "node_labels": node_labels,
-        "flannel_iface": DEFAULT_FLANNEL_IFACE if vpn_token is not None else "",
-        "backend": backend,
-        "frontend": frontend,
-        "protected_access": user_id
+        "flannel_iface": DEFAULT_FLANNEL_IFACE if vpn_token is not None else ""
     }
     # generate local config files
     compose_yaml = load_template(

{kalavai_client-0.6.2.dist-info → kalavai_client-0.6.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kalavai-client
-Version: 0.6.2
+Version: 0.6.3
 Summary: Client app for kalavai platform
 License: Apache-2.0
 Keywords: LLM,platform

{kalavai_client-0.6.2.dist-info → kalavai_client-0.6.3.dist-info}/RECORD

@@ -1,10 +1,10 @@
-kalavai_client/__init__.py,sha256=KHdxFPVZ8ieY1b3JqZNDqsGezrCIPje_GQszyzGWEVw,22
+kalavai_client/__init__.py,sha256=YPRovmUtXL2teOic_KNYxHp09zJ6yS_T_hR6yiFy5hI,22
 kalavai_client/__main__.py,sha256=WQUfxvRsBJH5gsCJg8pLz95QnZIj7Ol8psTO77m0QE0,73
 kalavai_client/assets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kalavai_client/assets/apps.yaml,sha256=H2HZQ_oqdNz2qPDs5_NtHvJo4rblH1DRPugzQYq_t5Q,6366
 kalavai_client/assets/apps_values.yaml,sha256=WRew3bS1MztjzcJfphuJcKn0n2T1ICRupPpr_Csjt_s,1644
 kalavai_client/assets/docker-compose-gui.yaml,sha256=DGCyGYzz1kH6kkMbo62FJHe3F9vcAmA8DOHw-c_o0Kw,752
-kalavai_client/assets/docker-compose-template.yaml,sha256=zJLk59DnoBkZscFJs50xgfwx9drmHArmivtQLevrHI8,2882
+kalavai_client/assets/docker-compose-template.yaml,sha256=88Bi8mxynoK9lHi4d_yqaRVQCwbJfzkY8SUoYnEArRU,1589
 kalavai_client/assets/nginx.conf,sha256=drVVCg8GHucz7hmt_BI6giAhK92OV71257NTs3LthwM,225
 kalavai_client/assets/pool_config_template.yaml,sha256=fFz4w2-fMKD5KvyzFdfcWD_jSneRlmnjLc8hCctweX0,576
 kalavai_client/assets/pool_config_values.yaml,sha256=VrM3XHQfQo6QLZ68qvagooUptaYgl1pszniY_JUtemk,233
@@ -13,13 +13,13 @@ kalavai_client/assets/user_workspace_values.yaml,sha256=G0HOzQUxrDMCwuW9kbWUZaKM
 kalavai_client/auth.py,sha256=EB3PMvKUn5_KAQkezkEHEt-OMZXyfkZguIQlUFkEHcA,3243
 kalavai_client/bridge_api.py,sha256=KecIZvsGRiZgUQaDSgvRBLaqPDBhxFKS6FBH_w5ArCc,7015
 kalavai_client/bridge_models.py,sha256=IGPLAYEZG4f5EUtBuoR2u_cYoyCCVkhx4H2rMeGuJ_Y,1030
-kalavai_client/cli.py,sha256=YHC74zg5z3Hw4s101TsV-rmi4WYY1ZIdC2OavNeA1wc,47114
+kalavai_client/cli.py,sha256=kvQXuIdSd2BYavnqLkd7phFUD3htxjVcSJaqnaEAGtI,46904
 kalavai_client/cluster.py,sha256=gwjmdsd--YrffT0BmZDOEpbrdm3lPskUuN5jdgcrOR0,12947
-kalavai_client/core.py,sha256=rPnKRvyORYP6hhPv_NyHEm8XtEy1DOY3VQ5ambvPZDY,32733
+kalavai_client/core.py,sha256=1qT6d4LpZIHHQaCDZHVmk4crkcOShzVMCL4Pax8ShVI,32526
 kalavai_client/env.py,sha256=wAd-P8XDlDB8Oau76f0bG2aHTkNA793xb_V0frbNeJE,2770
-kalavai_client/utils.py,sha256=LqcG2fOJcvqEuC348ddwhStd6zqiXo7nuQ2VlU9v9Lg,12156
-kalavai_client-0.6.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-kalavai_client-0.6.2.dist-info/METADATA,sha256=zaRbaISgFAHXJR8f1_2m_YynbeRrR2I5KUqTLcqABQ0,13353
-kalavai_client-0.6.2.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-kalavai_client-0.6.2.dist-info/entry_points.txt,sha256=9T6D45gxwzfVbglMm1r6XPdXuuZdHfy_7fCeu2jUphc,50
-kalavai_client-0.6.2.dist-info/RECORD,,
+kalavai_client/utils.py,sha256=k2Bpvl16zDpWBXMIMsd_LbkinZtctPO6bygfB7DyiZ8,12018
+kalavai_client-0.6.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+kalavai_client-0.6.3.dist-info/METADATA,sha256=8Q4iCcpjFF9gRDYEeQbaZHAegUn_v4yn8-w5Y7sAiM4,13353
+kalavai_client-0.6.3.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+kalavai_client-0.6.3.dist-info/entry_points.txt,sha256=9T6D45gxwzfVbglMm1r6XPdXuuZdHfy_7fCeu2jUphc,50
+kalavai_client-0.6.3.dist-info/RECORD,,