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

kalavai_client/__init__.py

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

kalavai_client/assets/docker-compose-gui.yaml

@@ -2,7 +2,6 @@ services:
   kalavai_gui:
     container_name: kalavai_gui
     image: bundenth/kalavai-gui:latest
-    #network_mode: host
     extra_hosts:
     - "host.docker.internal:host-gateway"
     networks:

kalavai_client/assets/docker-compose-template.yaml

@@ -3,38 +3,58 @@ services:
   {{vpn_name}}:
     image: gravitl/netclient:v0.90.0
     container_name: {{vpn_name}}
-    #privileged: true
     cap_add:
       - NET_ADMIN
       - SYS_MODULE
     network_mode: host
-    # networks:
-    # - custom-network
-    # ports:
-    # # https://docs.k3s.io/installation/requirements#inbound-rules-for-k3s-nodes
-    # - "6443:6443" # kube server
-    # - "10250:10250" # worker balancer
-    # - "8472:8472/udp" # flannel vxlan
-    # - "51820-51830:51820-51830" # flannel wireguard
-    # {% if command == "server" %}
-    # - "30000-30500:30000-30500"
-    # {% endif %}
     environment:
       - HOST_NAME={{node_name}}
-      - IFACE_NAME={{flannel_iface}}
       - TOKEN={{vpn_token}}
     volumes:
       - /dev/net/tun:/dev/net/tun
     restart: unless-stopped
-#   nginx:
-#     image: nginx:latest
-#     ports:
-#       - "{{redirect_source_port}}:{{redirect_source_port}}"
-#     restart: unless-stopped
-#     networks:
-#       - custom-network
-#     volumes:
-#       - {{nginx_path}}/nginx.conf:/etc/nginx/nginx.conf
+{% 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
@@ -48,21 +68,6 @@ services:
     network_mode: "service:{{vpn_name}}"
   {% else %}
     network_mode: host
-    # hostname: {{node_name}}
-    # networks:
-    # - custom-network
-    # ports:
-    # - "6443:6443" # kube server
-    # - "2379-2380:2379-2380" # etcd server
-    # - "10259:10259" # kube scheduler
-    # - "10257:10257" # kube controller manager
-    # - "10250:10250" # worker balancer
-    # - "8285:8285" # flannel
-    # - "8472:8472" # flannel vxlan
-    # - "51820:51820" # flannel wireguard
-    # {% if command == "server" %}
-    # - "30000-32767:30000-32767"
-    # {% endif %}
   {% endif %}
     privileged: true
     restart: unless-stopped
@@ -103,7 +108,6 @@ services:
   {% endif %}
 {% endif %}
 
-# networks:
-#   custom-network:
-#     driver: bridge
-
+networks:
+  kalavai-net:
+    driver: bridge

kalavai_client/bridge_api.py

@@ -75,7 +75,8 @@ def pool_create(request: CreatePoolRequest, api_key: str = Depends(verify_api_ke
         only_registered_users=request.only_registered_users,
         location=request.location,
         description=request.description,
-        token_mode=request.token_mode
+        token_mode=request.token_mode,
+        frontend=request.frontend
     )
     return result
 
@@ -85,7 +86,8 @@ def pool_join(request: JoinPoolRequest, api_key: str = Depends(verify_api_key)):
         token=request.token,
         num_gpus=request.num_gpus,
         node_name=request.node_name,
-        ip_address=request.ip_address
+        ip_address=request.ip_address,
+        frontend=request.frontend
     )
     return result
 
@@ -93,7 +95,8 @@ def pool_join(request: JoinPoolRequest, api_key: str = Depends(verify_api_key)):
 def pool_attach(request: JoinPoolRequest, api_key: str = Depends(verify_api_key)):
     result = attach_to_pool(
         token=request.token,
-        node_name=request.node_name
+        node_name=request.node_name,
+        frontend=request.frontend
     )
     return result
 

kalavai_client/bridge_models.py

@@ -16,6 +16,7 @@ class CreatePoolRequest(BaseModel):
     location: str = None
     token_mode: TokenType = TokenType.USER
     description: str = ""
+    frontend: bool = False
 
 class NodesActionRequest(BaseModel):
     nodes: list[str]
@@ -25,7 +26,7 @@ class JoinPoolRequest(BaseModel):
     ip_address: str = None
     node_name: str = None
     num_gpus: int = None
-
+    frontend: bool = False
 class JobDetailsRequest(BaseModel):
     jobs: list[Job]
 

kalavai_client/cli.py

@@ -6,13 +6,10 @@ import uuid
 import time
 import socket
 from pathlib import Path
-from getpass import getpass
-from sys import exit
 
 import yaml
 
 import arguably
-from kalavai_client.auth import KalavaiAuth
 from rich.console import Console
 
 from kalavai_client.cluster import CLUSTER
@@ -208,7 +205,6 @@ def input_gpus(non_interactive=False):
 @arguably.command
 def gui__start(
     *others,
-    backend_only=False,
     gui_frontend_port=3000,
     gui_backend_port=8000,
     bridge_port=8001,
@@ -227,32 +223,36 @@ def gui__start(
             console.log("[red]Error: user key not found (required for protected access)")
             return
     
-    if not backend_only:
-        values = {
-            "gui_frontend_port": gui_frontend_port,
-            "gui_backend_port": gui_backend_port,
-            "bridge_port": bridge_port,
-            "path": user_path(""),
-            "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")
+    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")
 
-        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)
-    
-    if not backend_only:
-        run_cmd(f"docker compose --file {USER_GUI_COMPOSE_FILE} down")
+    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")
 
 @arguably.command
 def auth(user_key, *others):

kalavai_client/core.py

@@ -573,7 +573,9 @@ def attach_to_pool(token, node_name=None):
     generate_compose_config(
         role="",
         vpn_token=public_location,
-        node_name=node_name)
+        node_name=node_name,
+        backend=True,
+        frontend=True)
     
     store_server_info(
         server_ip=kalavai_seed_ip,
@@ -637,7 +639,9 @@ 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)
+        node_labels=node_labels,
+        backend=False,
+        frontend=False)
     
     return compose
 
@@ -684,7 +688,9 @@ 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)
+        node_labels=node_labels,
+        backend=True,
+        frontend=True)
     
     store_server_info(
         server_ip=kalavai_seed_ip,
@@ -770,7 +776,10 @@ def create_pool(
         node_ip_address=ip_address,
         num_gpus=num_gpus,
         node_name=node_name,
-        node_labels=node_labels
+        node_labels=node_labels,
+        backend=True,
+        frontend=True,
+        user_id=user_id
     )
     
     # start server
@@ -789,7 +798,6 @@ def create_pool(
     auth_key = user_id if user_id is not None else str(uuid.uuid4())
     write_auth_key = str(uuid.uuid4())
     readonly_auth_key = str(uuid.uuid4())
-    
     watcher_service = f"{ip_address}:{DEFAULT_WATCHER_PORT}"
     values = {
         CLUSTER_NAME_KEY: cluster_name,

kalavai_client/env.py

@@ -3,10 +3,15 @@ from pathlib import Path
 import importlib.resources
 
 
+DEFAULT_KALAVAI_PATH = os.getenv("KALAVAI_PATH", "")
+
 def user_path(relative_path, create_path=False):
     """Transform a relative path into the user's cache folder path"""
-    base = os.path.expanduser("~")
-    kalavai_user_path = os.path.join(base, ".cache/kalavai")
+    if len(DEFAULT_KALAVAI_PATH.strip()) > 0:
+        kalavai_user_path = DEFAULT_KALAVAI_PATH
+    else:
+        base = os.path.expanduser("~")
+        kalavai_user_path = os.path.join(base, ".cache/kalavai")
     full_path = os.path.join(kalavai_user_path, relative_path)
     if create_path:
         Path(full_path).mkdir(parents=True, exist_ok=True)
@@ -34,7 +39,7 @@ KALAVAI_PLATFORM_ENDPOINT = "https://platform.kalavai.net/_/api"
 DEFAULT_CONTAINER_NAME = "kalavai"
 DEFAULT_VPN_CONTAINER_NAME = "kalavai-vpn"
 CONTAINER_HOST_PATH = user_path("pool/", create_path=True)
-DEFAULT_FLANNEL_IFACE = os.getenv("KALAVAI_FLANNEL_IFACE", "netmaker-1")
+DEFAULT_FLANNEL_IFACE = os.getenv("KALAVAI_FLANNEL_IFACE", "netmaker")
 DEFAULT_WATCHER_PORT = 30001
 KUBE_VERSION = os.getenv("KALAVAI_KUBE_VERSION", "v1.31.1+k3s1")
 FORBIDEDEN_IPS = ["127.0.0.1"]

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):
+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):
     
     if node_labels is not None:
         node_labels = " ".join([f"--node-label {key}={value}" for key, value in node_labels.items()])
@@ -121,7 +121,10 @@ 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 ""
+        "flannel_iface": DEFAULT_FLANNEL_IFACE if vpn_token is not None else "",
+        "backend": backend,
+        "frontend": frontend,
+        "protected_access": user_id
     }
     # generate local config files
     compose_yaml = load_template(

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

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

kalavai_client-0.6.2.dist-info/RECORD

@@ -0,0 +1,25 @@
+kalavai_client/__init__.py,sha256=KHdxFPVZ8ieY1b3JqZNDqsGezrCIPje_GQszyzGWEVw,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/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
+kalavai_client/assets/user_workspace.yaml,sha256=wDvlMYknOPABAEo0dsQwU7bac8iubjAG9tdkFbJZ5Go,476
+kalavai_client/assets/user_workspace_values.yaml,sha256=G0HOzQUxrDMCwuW9kbWUZaKMzDDPVwDwzBHCL2Xi2ZM,542
+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/cluster.py,sha256=gwjmdsd--YrffT0BmZDOEpbrdm3lPskUuN5jdgcrOR0,12947
+kalavai_client/core.py,sha256=rPnKRvyORYP6hhPv_NyHEm8XtEy1DOY3VQ5ambvPZDY,32733
+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-0.6.0.dist-info/RECORD

@@ -1,25 +0,0 @@
-kalavai_client/__init__.py,sha256=kdEPlDp6IaQ7VW5poiOUuYIU9_F2zMlsQ58FC7Mp1Bw,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=IHClIltiu8C4nHbgDgAscf3Ls6UFngbeQP07kj31kjM,776
-kalavai_client/assets/docker-compose-template.yaml,sha256=0ckkXC2OJTWnjyyjtwCIckUc22xhY_84aCQjz1WSlBk,2831
-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
-kalavai_client/assets/user_workspace.yaml,sha256=wDvlMYknOPABAEo0dsQwU7bac8iubjAG9tdkFbJZ5Go,476
-kalavai_client/assets/user_workspace_values.yaml,sha256=G0HOzQUxrDMCwuW9kbWUZaKMzDDPVwDwzBHCL2Xi2ZM,542
-kalavai_client/auth.py,sha256=EB3PMvKUn5_KAQkezkEHEt-OMZXyfkZguIQlUFkEHcA,3243
-kalavai_client/bridge_api.py,sha256=IkKq_CODA4p4UJkk6UqXKHkz5m2ESq2mL3tKqkQk6T0,6910
-kalavai_client/bridge_models.py,sha256=k4ILxa8jfAcfgIIBJqK1DunDzHh_oNUpuiEpmhAfTP0,977
-kalavai_client/cli.py,sha256=Cq0aC7L8kV1Ag2Olm3NGY51BMLBAjcsDH3mhmyfz6cA,47089
-kalavai_client/cluster.py,sha256=gwjmdsd--YrffT0BmZDOEpbrdm3lPskUuN5jdgcrOR0,12947
-kalavai_client/core.py,sha256=CWJQ38BZ2mLavfOCyR7wsDdy4fRTpjnYmggoXcR9Ji8,32531
-kalavai_client/env.py,sha256=_T3D0Hns5yAbFS3Hp1Vt73FZWLMtKSUJz2XXR9kJvEY,2605
-kalavai_client/utils.py,sha256=k2Bpvl16zDpWBXMIMsd_LbkinZtctPO6bygfB7DyiZ8,12018
-kalavai_client-0.6.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-kalavai_client-0.6.0.dist-info/METADATA,sha256=NufPp5kOZHUqWASe0nHrecbPZPGMOUOPE91PYTA_Fpg,13353
-kalavai_client-0.6.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-kalavai_client-0.6.0.dist-info/entry_points.txt,sha256=9T6D45gxwzfVbglMm1r6XPdXuuZdHfy_7fCeu2jUphc,50
-kalavai_client-0.6.0.dist-info/RECORD,,