kalavai-client 0.5.14__py3-none-any.whl → 0.5.16__py3-none-any.whl

kalavai_client/env.py

@@ -1,5 +1,6 @@
 import os
 from pathlib import Path
+import importlib.resources
 
 
 def user_path(relative_path, create_path=False):
@@ -12,8 +13,46 @@ def user_path(relative_path, create_path=False):
     
     return full_path
 
+def resource_path(relative_path: str):
+    """ Get absolute path to resource """
+    try:
+        last_slash = relative_path.rfind("/") 
+        path = relative_path[:last_slash].replace("/", ".")
+        filename = relative_path[last_slash+1:]
+        resource = str(importlib.resources.files(path).joinpath(filename))
+    except Exception as e:
+        return None
+    return resource
 
+
+TEMPLATE_LABEL = "kalavai.job.name"
+STORAGE_CLASS_LABEL = "kalavai.storage.enabled"
+USER_NODE_LABEL = "kalavai.cluster.user"
+SERVER_IP_KEY = "server_ip"
+KALAVAI_PLATFORM_URL = "https://platform.kalavai.net"
+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_WATCHER_PORT = 30001
+KUBE_VERSION = os.getenv("KALAVAI_KUBE_VERSION", "v1.31.1+k3s1")
+FORBIDEDEN_IPS = ["127.0.0.1"]
+# kalavai templates
+HELM_APPS_FILE = resource_path("kalavai_client/assets/apps.yaml")
+HELM_APPS_VALUES = resource_path("kalavai_client/assets/apps_values.yaml")
+DOCKER_COMPOSE_TEMPLATE = resource_path("kalavai_client/assets/docker-compose-template.yaml")
+DOCKER_COMPOSE_GUI = resource_path("kalavai_client/assets/docker-compose-gui.yaml")
+USER_WORKSPACE_TEMPLATE = resource_path("kalavai_client/assets/user_workspace.yaml")
+DEFAULT_USER_WORKSPACE_VALUES = resource_path("kalavai_client/assets/user_workspace_values.yaml")
+POOL_CONFIG_TEMPLATE = resource_path("kalavai_client/assets/pool_config_template.yaml")
+POOL_CONFIG_DEFAULT_VALUES = resource_path("kalavai_client/assets/pool_config_values.yaml")
+# user specific config files
+USER_TEMPLATES_FOLDER = user_path("templates", create_path=True)
 USER_LOCAL_SERVER_FILE = user_path(".server")
 USER_COOKIE = user_path(".user_cookie.pkl")
-TEMPLATE_LABEL = "kalavai.job.name"
-SERVER_IP_KEY = "server_ip"
+USER_COMPOSE_FILE = user_path("docker-compose-worker.yaml")
+USER_GUI_COMPOSE_FILE = user_path("docker-compose-gui.yaml")
+USER_HELM_APPS_FILE = user_path("apps.yaml")
+USER_KUBECONFIG_FILE = user_path("kubeconfig")
+USER_VPN_COMPOSE_FILE = user_path("docker-compose-vpn.yaml")

kalavai_client/utils.py

@@ -1,12 +1,12 @@
 import json, base64
 import os
+import uuid
 import requests
 from pathlib import Path
 import shutil
 import subprocess
 import re
 
-import importlib
 from jinja2 import Template
 
 from rich.table import Table
@@ -15,7 +15,14 @@ import yaml
 
 from kalavai_client.auth import KalavaiAuthClient
 from kalavai_client.env import (
-    SERVER_IP_KEY
+    SERVER_IP_KEY,
+    DOCKER_COMPOSE_TEMPLATE,
+    DEFAULT_CONTAINER_NAME,
+    DEFAULT_FLANNEL_IFACE,
+    DEFAULT_VPN_CONTAINER_NAME,
+    CONTAINER_HOST_PATH,
+    USER_COMPOSE_FILE,
+    user_path
 )
 
 
@@ -85,14 +92,46 @@ def is_storage_compatible():
         return False
 ################
 
-def is_watcher_alive(server_creds, user_cookie):
+def generate_compose_config(role, node_name, is_public, 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()])
+    rand_suffix = uuid.uuid4().hex[:8]
+    compose_values = {
+        "user_path": user_path(""),
+        "service_name": DEFAULT_CONTAINER_NAME,
+        "vpn": is_public,
+        "vpn_name": DEFAULT_VPN_CONTAINER_NAME,
+        "node_ip_address": node_ip_address,
+        "pool_ip": pool_ip,
+        "pool_token": pool_token,
+        "vpn_token": vpn_token,
+        "node_name": node_name,
+        "command": role,
+        "storage_enabled": "True",
+        "num_gpus": num_gpus,
+        "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 is_public else ""
+    }
+    # generate local config files
+    compose_yaml = load_template(
+        template_path=DOCKER_COMPOSE_TEMPLATE,
+        values=compose_values)
+    with open(USER_COMPOSE_FILE, "w") as f:
+        f.write(compose_yaml)
+    return compose_yaml
+
+def is_watcher_alive(server_creds, user_cookie, timeout=30):
     try:
         request_to_server(
             method="get",
             endpoint="/v1/health",
             data=None,
             server_creds=server_creds,
-            user_cookie=user_cookie
+            user_cookie=user_cookie,
+            timeout=timeout
         )
     except Exception as e:
         print(str(e))
@@ -260,7 +299,8 @@ def request_to_server(
         server_creds,
         force_url=None,
         force_key=None,
-        user_cookie=None
+        user_cookie=None,
+        timeout=60
 ):
     if force_url is None:
         service_url = load_server_info(data_key=WATCHER_SERVICE_KEY, file=server_creds)
@@ -284,7 +324,8 @@ def request_to_server(
         method=method,
         url=f"http://{service_url}{endpoint}",
         json=data,
-        headers=headers
+        headers=headers,
+        timeout=timeout
     )
     try:
         result = response.json()
@@ -388,17 +429,6 @@ def encode_dict(data: dict):
 def decode_dict(str_data: str):
     return json.loads(base64.b64decode(str_data.encode()))
 
-def resource_path(relative_path: str):
-    """ Get absolute path to resource """
-    try:
-        last_slash = relative_path.rfind("/") 
-        path = relative_path[:last_slash].replace("/", ".")
-        filename = relative_path[last_slash+1:]
-        resource = str(importlib.resources.files(path).joinpath(filename))
-    except Exception as e:
-        return None
-    return resource
-
 def safe_remove(filepath, force=True):
     if not os.path.exists(filepath):
         return
@@ -407,6 +437,12 @@ def safe_remove(filepath, force=True):
             os.remove(filepath)
         if os.path.isdir(filepath):
             shutil.rmtree(filepath)
+        return
     except:
-        if force:
-            run_cmd(f"sudo rm -rf {filepath}")
+        pass
+
+    if force:
+        try:
+            run_cmd(f"rm -rf {filepath}")
+        except:
+            pass

{kalavai_client-0.5.14.dist-info → kalavai_client-0.5.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kalavai-client
-Version: 0.5.14
+Version: 0.5.16
 Summary: Client app for kalavai platform
 License: Apache-2.0
 Keywords: LLM,platform
@@ -31,6 +31,7 @@ Requires-Dist: jinja2 (==3.1.4)
 Requires-Dist: netifaces (==0.11.0)
 Requires-Dist: psutil (==5.9.8)
 Requires-Dist: py2app (==0.28.7) ; extra == "dev"
+Requires-Dist: pydantic (==2.10.6)
 Requires-Dist: pyinstaller (==6.5.0) ; extra == "dev"
 Requires-Dist: pyyaml (==6.0.2)
 Requires-Dist: requests (>=2.25)
@@ -46,11 +47,11 @@ Description-Content-Type: text/markdown
 <div align="center">
 
 ![GitHub Release](https://img.shields.io/github/v/release/kalavai-net/kalavai-client) ![PyPI - Downloads](https://img.shields.io/pypi/dm/kalavai-client?style=social)
- ![GitHub contributors](https://img.shields.io/github/contributors/kalavai-net/kalavai-client) ![GitHub License](https://img.shields.io/github/license/kalavai-net/kalavai-client) ![GitHub Repo stars](https://img.shields.io/github/stars/kalavai-net/kalavai-client) [![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fdiscord.com%2Fapi%2Finvites%2FeA3sEWGB%3Fwith_counts%3Dtrue&query=%24.approximate_member_count&logo=discord&logoColor=white&label=Discord%20users&color=green)](https://discordapp.com/channels/1295009828623880313) [![Signup](https://img.shields.io/badge/Kalavai-Signup-brightgreen)](https://platform.kalavai.net) 
+ ![GitHub contributors](https://img.shields.io/github/contributors/kalavai-net/kalavai-client) ![GitHub License](https://img.shields.io/github/license/kalavai-net/kalavai-client) ![GitHub Repo stars](https://img.shields.io/github/stars/kalavai-net/kalavai-client) [![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fdiscord.com%2Fapi%2Finvites%2FYN6ThTJKbM%3Fwith_counts%3Dtrue&query=%24.approximate_member_count&logo=discord&logoColor=white&label=Discord%20users&color=green)](https://discordapp.com/channels/1295009828623880313) [![Signup](https://img.shields.io/badge/Kalavai-Signup-brightgreen)](https://platform.kalavai.net) 
 
 </div>
 
-⭐⭐⭐ **Kalavai and our LLM pools are open source, and free to use in both commercial and non-commercial purposes. If you find it useful, consider supporting us by [giving a star to our GitHub project](https://github.com/kalavai-net/kalavai-client), joining our [discord channel](https://discord.gg/HJ8FNapQ), follow our [Substack](https://kalavainet.substack.com/) and give us a [review on Product Hunt](https://www.producthunt.com/products/kalavai/reviews/new).**
+⭐⭐⭐ **Kalavai and our LLM pools are open source, and free to use in both commercial and non-commercial purposes. If you find it useful, consider supporting us by [giving a star to our GitHub project](https://github.com/kalavai-net/kalavai-client), joining our [discord channel](https://discord.gg/YN6ThTJKbM), follow our [Substack](https://kalavainet.substack.com/) and give us a [review on Product Hunt](https://www.producthunt.com/products/kalavai/reviews/new).**
 
 
 # Kalavai: turn your devices into a scalable LLM platform
@@ -128,7 +129,7 @@ Not what you were looking for? [Tell us](https://github.com/kalavai-net/kalavai-
 - Get a free [Kalavai account](https://platform.kalavai.net) and access unlimited AI.
 - Full [documentation](https://kalavai-net.github.io/kalavai-client/) for the project.
 - [Join our Substack](https://kalavainet.substack.com/) for updates and be part of our community
-- [Join our discord community](https://discord.gg/6VJWGzxg)
+- [Join our discord community](https://discord.gg/YN6ThTJKbM)
 
 
 ## Getting started
@@ -322,3 +323,4 @@ python -m unittest
 ```
 
 docker run --rm --net=host -v   /root/.cache/kalavai/:/root/.cache/kalavai/  ghcr.io/helmfile/helmfile:v0.169.2 helmfile sync --file  /root/.cache/kalavai/apps.yaml --kubeconfig /root/.cache/kalavai/kubeconfig
+

kalavai_client-0.5.16.dist-info/RECORD

@@ -0,0 +1,23 @@
+kalavai_client/__init__.py,sha256=r18HAWHGJVUFx-29UpqHQDvNuq_9ey86nLfnKDvXHfM,23
+kalavai_client/__main__.py,sha256=WQUfxvRsBJH5gsCJg8pLz95QnZIj7Ol8psTO77m0QE0,73
+kalavai_client/assets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+kalavai_client/assets/apps.yaml,sha256=V1x1FY-fyYsYrXvcIMv3QrBCgJ7jNunluRyJh67eWB0,5983
+kalavai_client/assets/apps_values.yaml,sha256=CjKVelPQHd-hm-DTMEuya92feKiphU9mh3HrosLYYPE,1676
+kalavai_client/assets/docker-compose-gui.yaml,sha256=cLju75mcCExztRxwJy5BVk2zBNViOJVp9dqabHXZjE4,240
+kalavai_client/assets/docker-compose-template.yaml,sha256=Fnsk44oFtUqS2E77umVUiWl1-eS96E13TPe31GYo1XI,2825
+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=QsBh28L2LwjBBK6pTUE4Xu36lLDTyetyU1YfS1Hbb6g,1717
+kalavai_client/cli.py,sha256=GYi7X3F6j4GpbiZq8qrYXmXrkzeFVyO8gwhZAAkXeEs,48794
+kalavai_client/cluster.py,sha256=gwjmdsd--YrffT0BmZDOEpbrdm3lPskUuN5jdgcrOR0,12947
+kalavai_client/core.py,sha256=7hoddNN87NB2mvmBb9Flpi-8mbOufMljvYLUlEeH4lU,27247
+kalavai_client/env.py,sha256=Zg2pP-xGJpQumo56KMBxBLgIsBmcNN0S9R-ZP2-s630,2604
+kalavai_client/utils.py,sha256=rz5W9PRZrTpgdmOs6yeqUi4f_q_L-3BJ5g1o7Asgnyo,13386
+kalavai_client-0.5.16.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+kalavai_client-0.5.16.dist-info/METADATA,sha256=9DRC2jLu-pObMkhWXDRjHGLVbpJl8P3ITTEwdmyibyY,14389
+kalavai_client-0.5.16.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+kalavai_client-0.5.16.dist-info/entry_points.txt,sha256=9T6D45gxwzfVbglMm1r6XPdXuuZdHfy_7fCeu2jUphc,50
+kalavai_client-0.5.16.dist-info/RECORD,,

{kalavai_client-0.5.14.dist-info → kalavai_client-0.5.16.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.0.1
+Generator: poetry-core 2.1.1
 Root-Is-Purelib: true
 Tag: py3-none-any

kalavai_client-0.5.14.dist-info/RECORD

@@ -1,22 +0,0 @@
-kalavai_client/__init__.py,sha256=w3lW-XLGLyRg9TivuSzsLBUjs3nPX74ewdf47ZPX-as,23
-kalavai_client/__main__.py,sha256=WQUfxvRsBJH5gsCJg8pLz95QnZIj7Ol8psTO77m0QE0,73
-kalavai_client/assets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kalavai_client/assets/apps.yaml,sha256=yC-vtYTPE960KUQihTk5pee8xZz9RD8Reuyh1nSpRWk,5981
-kalavai_client/assets/apps_values.yaml,sha256=CjKVelPQHd-hm-DTMEuya92feKiphU9mh3HrosLYYPE,1676
-kalavai_client/assets/docker-compose-template.yaml,sha256=mo8LUam9-AzB_0w72wTyMyreKr4Ns-pxZGc4GVWcUHA,2747
-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=QsBh28L2LwjBBK6pTUE4Xu36lLDTyetyU1YfS1Hbb6g,1717
-kalavai_client/cli.py,sha256=tozKzLsDWFhztC5lcorryBcdhzSYyqb5XGWQsUtQ45A,66297
-kalavai_client/cluster.py,sha256=odzfJFrkKNvZpFFiTA4pg-CeRdPnIe2UyIpSItCjK6A,12319
-kalavai_client/core.py,sha256=Vb-5MBHjpuR590FIDOnytJpP1Xjt7hYqehPV2rh6P68,6863
-kalavai_client/env.py,sha256=RAi37vJtIGfPR25PNxZYMZNkkEKR4AyUPN_htFiFesM,575
-kalavai_client/utils.py,sha256=kQk_1QOs8u08rcfhkcfo_oC-cZzww0cij-1R_jK1ER8,12185
-kalavai_client-0.5.14.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-kalavai_client-0.5.14.dist-info/METADATA,sha256=au17zuHNT9eVKuhxpsp_Gqmx6YYksrkSRhnzEqAkZmk,14347
-kalavai_client-0.5.14.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-kalavai_client-0.5.14.dist-info/entry_points.txt,sha256=9T6D45gxwzfVbglMm1r6XPdXuuZdHfy_7fCeu2jUphc,50
-kalavai_client-0.5.14.dist-info/RECORD,,