kalavai-client 0.5.30__py3-none-any.whl → 0.6.1__py3-none-any.whl

kalavai_client/utils.py

@@ -12,8 +12,7 @@ from jinja2 import Template
 from rich.table import Table
 import yaml
 
-
-from kalavai_client.auth import KalavaiAuthClient
+from kalavai_client.auth import KalavaiAuth
 from kalavai_client.env import (
     SERVER_IP_KEY,
     DOCKER_COMPOSE_TEMPLATE,
@@ -22,6 +21,7 @@ from kalavai_client.env import (
     DEFAULT_VPN_CONTAINER_NAME,
     CONTAINER_HOST_PATH,
     USER_COMPOSE_FILE,
+    USER_COOKIE,
     user_path
 )
 
@@ -38,6 +38,8 @@ CLUSTER_NAME_KEY = "cluster_name"
 AUTH_KEY = "watcher_admin_key"
 WRITE_AUTH_KEY = "watcher_write_key"
 ALLOW_UNREGISTERED_USER_KEY = "watcher_allow_unregistered_user"
+DEPLOY_LLM_SIDECARS_KEY = "deploy_llm_sidecars"
+NODE_ROLE_LABEL = "kalavai.node_role"
 USER_API_KEY = "user_api_key"
 READONLY_AUTH_KEY = "watcher_readonly_key"
 WATCHER_SERVICE_KEY = "watcher_service"
@@ -62,6 +64,12 @@ MANDATORY_POOLCONFIG_FIELDS = [
     PUBLIC_LOCATION_KEY
 ]
 
+KALAVAI_AUTH = KalavaiAuth(
+    auth_service_url="dummy_url",
+    auth_service_key="dummy_key",
+    user_cookie_file=USER_COOKIE
+)
+
 
 ####### Methods to check OS compatibility ########
 def check_gpu_drivers():
@@ -92,7 +100,7 @@ def is_storage_compatible():
         return False
 ################
 
-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):
+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()])
@@ -100,7 +108,7 @@ def generate_compose_config(role, node_name, is_public, node_ip_address="0.0.0.0
     compose_values = {
         "user_path": user_path(""),
         "service_name": DEFAULT_CONTAINER_NAME,
-        "vpn": is_public,
+        "vpn": vpn_token is not None,
         "vpn_name": DEFAULT_VPN_CONTAINER_NAME,
         "node_ip_address": node_ip_address,
         "pool_ip": pool_ip,
@@ -113,14 +121,15 @@ def generate_compose_config(role, node_name, is_public, node_ip_address="0.0.0.0
         "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 ""
+        "flannel_iface": DEFAULT_FLANNEL_IFACE if vpn_token is not None 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)
+    if write_to_file:
+        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):
@@ -146,126 +155,63 @@ def load_server_info(data_key, file):
             return json.load(f)[data_key]
     except:
         return None
-    
-def user_login(user_cookie, username=None, password=None):
-    auth = KalavaiAuthClient(
-        user_cookie_file=user_cookie
-    )
-    user = auth.load_user_session()
-    if user is None:
-        user = auth.login(username=username, password=password)
-    return user
-
-def user_logout(user_cookie):
-    auth = KalavaiAuthClient(
-        user_cookie_file=user_cookie
-    )
-    auth.logout()
 
-def load_user_session(user_cookie):
-    auth = KalavaiAuthClient(
-        user_cookie_file=user_cookie
-    )
-    if not auth.is_logged_in():
-        return None
-    return auth.load_user_session()
+def load_user_session():
+    return KALAVAI_AUTH.load_user_session()
 
-def get_public_vpns(user_cookie):
-    auth = KalavaiAuthClient(
-        user_cookie_file=user_cookie
-    )
-    if not auth.is_logged_in():
-        raise ValueError("Cannot access vpns, user is not authenticated")
-    seeds = auth.call_function(
-        "get_public_vpns"
-    )
-    return seeds
+def load_user_id():
+    return KALAVAI_AUTH.get_user_id()
 
 def get_public_seeds(user_only, user_cookie):
-    auth = KalavaiAuthClient(
-        user_cookie_file=user_cookie
-    )
-    if not auth.is_logged_in():
-        raise ValueError("Cannot access vpns, user is not authenticated")
-    user = auth.load_user_session() if user_only else None
-    seeds = auth.call_function(
-        "get_available_seeds",
-        user
-    )
-    return seeds
-
-def get_vpn_details(location, user_cookie):
-    auth = KalavaiAuthClient(
-        user_cookie_file=user_cookie
-    )
-    if not auth.is_logged_in():
-        raise ValueError("Cannot access vpns, user is not authenticated")
-    vpn = auth.call_function(
-        "get_vpn_details",
-        location
-    )
-    return vpn
+    return []
+    # if not auth_obj.is_logged_in():
+    #     raise ValueError("Cannot access vpns, user is not authenticated")
+    # user = auth_obj.load_user_session() if user_only else None
+    # seeds = auth_obj.call_function(
+    #     "get_available_seeds",
+    #     user
+    # )
+    # return seeds
 
 def register_cluster(name, token, description, user_cookie, is_private=True):
-    auth = KalavaiAuthClient(
-        user_cookie_file=user_cookie
-    )
-    if not auth.is_logged_in():
-        raise ValueError("Cannot register cluster, user is not authenticated")
-    user = auth.load_user_session()
-    seed = auth.call_function(
-        "register_seed",
-        name,
-        user,
-        description,
-        token,
-        is_private
-    )
-    return seed
+    return None
+    # if not auth_obj.is_logged_in():
+    #     raise ValueError("Cannot register cluster, user is not authenticated")
+    # user = auth_obj.load_user_session()
+    # seed = auth_obj.call_function(
+    #     "register_seed",
+    #     name,
+    #     user,
+    #     description,
+    #     token,
+    #     is_private
+    # )
+    # return seed
 
 def unregister_cluster(name, user_cookie):
-    auth = KalavaiAuthClient(
-        user_cookie_file=user_cookie
-    )
-    if not auth.is_logged_in():
-        raise ValueError("Cannot unregister cluster, user is not authenticated")
-    user = auth.load_user_session()
-    seed = auth.call_function(
-        "unregister_seed",
-        name,
-        user,
-    )
-    return seed
-
-def validate_join_public_seed(cluster_name, join_key, user_cookie):
-    auth = KalavaiAuthClient(
-        user_cookie_file=user_cookie
-    )
-    if not auth.is_logged_in():
-        raise ValueError("Cannot notify join cluster, user is not authenticated")
-    user = auth.load_user_session()
-    seed = auth.call_function(
-        "validate_join_public_seed",
-        cluster_name,
-        join_key,
-        user,
-    )
-    return seed
+    return None
+    # if not auth_obj.is_logged_in():
+    #     raise ValueError("Cannot unregister cluster, user is not authenticated")
+    # user = auth_obj.load_user_session()
+    # seed = auth_obj.call_function(
+    #     "unregister_seed",
+    #     name,
+    #     user,
+    # )
+    # return seed
 
 def send_pool_invite(cluster_name, invitee_addresses, user_cookie):
-    auth = KalavaiAuthClient(
-        user_cookie_file=user_cookie
-    )
-    if not auth.is_logged_in():
-        raise ValueError("Cannot notify join cluster, user is not authenticated")
-    user = auth.load_user_session()
-    result = auth.call_function(
-        "send_pool_invite",
-        user,
-        cluster_name,
-        invitee_addresses
-    )
-    return result
+    return None
+    # if not auth_obj.is_logged_in():
+    #     raise ValueError("Cannot notify join cluster, user is not authenticated")
+    # user = auth_obj.load_user_session()
+    # result = auth_obj.call_function(
+    #     "send_pool_invite",
+    #     user,
+    #     cluster_name,
+    #     invitee_addresses
+    # )
+    # return result
 
 def validate_poolconfig(poolconfig_file):
     if not Path(poolconfig_file).is_file():
@@ -284,20 +230,6 @@ def run_cmd(command):
     except OSError as error:
         return error # for exit code
 
-def join_vpn(location, user_cookie):
-    vpn = get_vpn_details(location=location, user_cookie=user_cookie)
-    token = vpn["key"]
-    if token is None:
-        raise ValueError(f"VPN location {location} not found or is private")
-    try:
-        data = decode_dict(token)
-        for field in ["server", "value"]:
-            assert field in data
-    except:
-        raise ValueError("Invalid net token")
-    run_cmd(f"sudo netclient join -t {token} >/dev/null 2>&1")
-    return vpn
-
 def leave_vpn(container_name):
     try:
         vpns = json.loads(run_cmd(f"docker exec {container_name} netclient list").decode())
@@ -332,9 +264,10 @@ def request_to_server(
         "X-API-KEY": auth_key
     }
 
-    user = load_user_session(user_cookie=user_cookie)
     headers["USER-KEY"] = load_server_info(data_key=USER_API_KEY, file=server_creds)
-    headers["USER"] = user["username"] if user is not None else None
+    user_id = load_user_id()
+    if user_id is not None:
+        headers["USER"] = user_id
 
     response = requests.request(
         method=method,

{kalavai_client-0.5.30.dist-info → kalavai_client-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kalavai-client
-Version: 0.5.30
+Version: 0.6.1
 Summary: Client app for kalavai platform
 License: Apache-2.0
 Keywords: LLM,platform
@@ -23,7 +23,6 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Provides-Extra: dev
 Requires-Dist: Pillow (==10.3.0)
-Requires-Dist: anvil-uplink (==0.5.1)
 Requires-Dist: arguably (>=1.2.5)
 Requires-Dist: build ; extra == "dev"
 Requires-Dist: fastapi (==0.115.8)
@@ -53,10 +52,10 @@ Description-Content-Type: text/markdown
 
 </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/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 and our AI 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
+# Kalavai: turn your devices into a scalable AI platform
 
 ### Taming the adoption of Large Language Models
 
@@ -71,7 +70,7 @@ Description-Content-Type: text/markdown
 
 ## What can Kalavai do?
 
-Kalavai's goal is to make using LLMs in real applications accessible and affordable to all. It's a _magic box_ that **integrates all the components required to make LLM useful in the age of massive computing**, from sourcing computing power, managing distributed infrastructure and storage, using industry-standard model engines and orchestration of LLMs. 
+Kalavai's goal is to make using AI (LLMs, AI agents) in real applications accessible and affordable to all. It's a _magic box_ that **integrates all the components required to make AI useful in the age of massive computing**, from model deployment and orchestration to Agentic AI. 
 
 ### Core features
 
@@ -86,18 +85,6 @@ Kalavai's goal is to make using LLMs in real applications accessible and afforda
 
 **<summary>Video tutorials</summary>**
 
-### Aggregate multiple devices in an LLM pool
-
-https://github.com/user-attachments/assets/4be59886-1b76-4400-ab5c-c803e3e414ec
-
-### Deploy LLMs across the pool
-
-https://github.com/user-attachments/assets/ea57a2ab-3924-4097-be2a-504e0988fbb1
-
-### Single point of entry for all models (GUI + API)
-
-https://github.com/user-attachments/assets/7df73bbc-d129-46aa-8ce5-0735177dedeb
-
 ### Self-hosted LLM pools
 
 https://github.com/user-attachments/assets/0d2316f3-79ea-46ac-b41e-8ef720f52672
@@ -211,7 +198,7 @@ pip install kalavai-client
 ```
 
 
-## Create a a local, private LLM pool
+## Create a a local, private AI pool
 
 > Kalavai is **free to use, no caps, for both commercial and non-commercial purposes**. All you need to get started is one or more computers that can see each other (i.e. within the same network), and you are good to go. If you are interested in join computers in different locations / networks, [contact us](mailto:info@kalavai.net) or [book a demo](https://app.onecal.io/b/kalavai/book-a-demo) with the founders.
 
@@ -228,13 +215,6 @@ This will expose the GUI and the backend services in localhost. By default, the
 Check out our [getting started guide](https://kalavai-net.github.io/kalavai-client/getting_started/) for next steps.
 
 
-## Public LLM pools: crowdsource community resources
-
-This is the **easiest and most powerful** way to experience Kalavai. It affords users the full resource capabilities of the community and access to all its deployed LLMs, via an [OpenAI-compatible endpoint](https://kalavai-net.github.io/kalavai-client/public_llm_pool/#single-api-endpoint) as well as a [UI-based playground](https://kalavai-net.github.io/kalavai-client/public_llm_pool/#ui-playground).
-
-Check out [our guide](https://kalavai-net.github.io/kalavai-client/public_llm_pool/) on how to join and start deploying LLMs.
-
-
 ## Enough already, let's run stuff!
 
 Check our [examples](examples/) to put your new AI pool to good use! For an end to end tour, check our [self-hosted](https://kalavai-net.github.io/kalavai-client/self_hosted_llm_pool/) and [public LLM pools](https://kalavai-net.github.io/kalavai-client/public_llm_pool/) guides.
@@ -268,7 +248,6 @@ The kalavai client, which controls and access pools, can be installed on any mac
 - [x] Kalavai client on Linux
 - [x] [TEMPLATE] Distributed LLM deployment
 - [x] Kalavai client on Windows (with WSL2)
-- [x] Public LLM pools
 - [x] Self-hosted LLM pools
 - [x] Collaborative LLM deployment
 - [x] Ray cluster support
@@ -308,7 +287,7 @@ Python version >= 3.6.
 ```bash
 sudo add-apt-repository ppa:deadsnakes/ppa
 sudo apt update
-sudo apt install python3.10 python3.10-dev python3-virtualenv
+sudo apt install python3.10 python3.10-dev python3-virtualenv python3-venv
 virtualenv -p python3.10 env
 source env/bin/activate
 sudo apt install  python3.10-venv python3.10-dev -y

kalavai_client-0.6.1.dist-info/RECORD

@@ -0,0 +1,25 @@
+kalavai_client/__init__.py,sha256=RUEIQh8z_V_kGKsMyzH8WJLz-dW7GvzomrpPti1qfDw,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=uct7xmXtO1XgNimdirSiQusb-RYsPbnL67TVkj2oWrU,2772
+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=TUZJDmHdpBnF7Po-rnI97S1VYDPWxde1JqaHtb9xlIQ,46996
+kalavai_client/cluster.py,sha256=gwjmdsd--YrffT0BmZDOEpbrdm3lPskUuN5jdgcrOR0,12947
+kalavai_client/core.py,sha256=CWJQ38BZ2mLavfOCyR7wsDdy4fRTpjnYmggoXcR9Ji8,32531
+kalavai_client/env.py,sha256=J-9_YopIIVBCnwTFxoQ9jq8JWUDdKrB__S-Wig6TWSU,2767
+kalavai_client/utils.py,sha256=k2Bpvl16zDpWBXMIMsd_LbkinZtctPO6bygfB7DyiZ8,12018
+kalavai_client-0.6.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+kalavai_client-0.6.1.dist-info/METADATA,sha256=0VhOSaYS1GdoXSE0w_YNYjfjiXHZ57SiLe3IRVJ7Sz4,13353
+kalavai_client-0.6.1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+kalavai_client-0.6.1.dist-info/entry_points.txt,sha256=9T6D45gxwzfVbglMm1r6XPdXuuZdHfy_7fCeu2jUphc,50
+kalavai_client-0.6.1.dist-info/RECORD,,

{kalavai_client-0.5.30.dist-info → kalavai_client-0.6.1.dist-info}/WHEEL

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

kalavai_client-0.5.30.dist-info/RECORD

@@ -1,25 +0,0 @@
-kalavai_client/__init__.py,sha256=ROmnKI7L1DQjR4ddCvAjjSIbyHpDByVfi5X4UwPtjws,23
-kalavai_client/__main__.py,sha256=WQUfxvRsBJH5gsCJg8pLz95QnZIj7Ol8psTO77m0QE0,73
-kalavai_client/assets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kalavai_client/assets/apps.yaml,sha256=XahTRpFiaUG3jJGAzokWnNkaVnoogjxHVXBw2kSrwq8,6304
-kalavai_client/assets/apps_values.yaml,sha256=CjKVelPQHd-hm-DTMEuya92feKiphU9mh3HrosLYYPE,1676
-kalavai_client/assets/docker-compose-gui.yaml,sha256=6OHZIDDTl_PwXSYo1d05JasWfT0iiUDhrja0nQDjrlw,692
-kalavai_client/assets/docker-compose-template.yaml,sha256=ii24Nn-dM5cZk9lxFgrzxnmK7yv_6kIIw7KUlWhvYeI,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=QsBh28L2LwjBBK6pTUE4Xu36lLDTyetyU1YfS1Hbb6g,1717
-kalavai_client/bridge_api.py,sha256=xBd3KGoDcruuo53uNWOwA30CIPYgQLX8IkJWJgNHq9s,5546
-kalavai_client/bridge_models.py,sha256=k4ILxa8jfAcfgIIBJqK1DunDzHh_oNUpuiEpmhAfTP0,977
-kalavai_client/cli.py,sha256=MNmn8DgnEuyaCV8cMqr17JvfjalHcrP5Udpjn2jVXp8,46713
-kalavai_client/cluster.py,sha256=gwjmdsd--YrffT0BmZDOEpbrdm3lPskUuN5jdgcrOR0,12947
-kalavai_client/core.py,sha256=m5FOPzix8oNBlLqgllgJ0PwLXxo-s438fjJ0FPRVIZs,33266
-kalavai_client/env.py,sha256=Zg2pP-xGJpQumo56KMBxBLgIsBmcNN0S9R-ZP2-s630,2604
-kalavai_client/utils.py,sha256=OPmrsycNyrs2ZpTsjAzBuPN8hQNJtsYDLPKU13tnf-U,13862
-kalavai_client-0.5.30.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-kalavai_client-0.5.30.dist-info/METADATA,sha256=Fi8DEzalDmDoASySWKmqIMx4A1DPLrWE8AO_lBtRml0,14443
-kalavai_client-0.5.30.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-kalavai_client-0.5.30.dist-info/entry_points.txt,sha256=9T6D45gxwzfVbglMm1r6XPdXuuZdHfy_7fCeu2jUphc,50
-kalavai_client-0.5.30.dist-info/RECORD,,