kalavai-client 0.6.8__py3-none-any.whl → 0.6.10__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,2 +1,2 @@
1
1
 
2
- __version__ = "0.6.8"
2
+ __version__ = "0.6.10"
@@ -30,6 +30,9 @@ services:
30
30
  restart: unless-stopped
31
31
  command: >
32
32
  --command={{command}}
33
+ {% if user_id %}
34
+ --user_id={{user_id}}
35
+ {% endif %}
33
36
  --node_name="{{node_name}}"
34
37
  --node_ip="{{node_ip_address}}"
35
38
  {% if command == "server" %}
kalavai_client/env.py CHANGED
@@ -4,6 +4,7 @@ import importlib.resources
4
4
 
5
5
 
6
6
  DEFAULT_KALAVAI_PATH = os.getenv("KALAVAI_PATH", "")
7
+ KALAVAI_USER_ID = os.getenv("KALAVAI_USER_ID", None)
7
8
 
8
9
  def user_path(relative_path, create_path=False):
9
10
  """Transform a relative path into the user's cache folder path"""
kalavai_client/utils.py CHANGED
@@ -22,10 +22,10 @@ from kalavai_client.env import (
22
22
  CONTAINER_HOST_PATH,
23
23
  USER_COMPOSE_FILE,
24
24
  USER_COOKIE,
25
+ KALAVAI_USER_ID,
25
26
  user_path
26
27
  )
27
28
 
28
-
29
29
  GITHUB_ORG = "kalavai-net"
30
30
  GITHUB_REPO = "kalavai-client"
31
31
  GITHUB_TEMPLATE_PATH = "templates"
@@ -121,7 +121,8 @@ def generate_compose_config(role, node_name, write_to_file=True, node_ip_address
121
121
  "k3s_path": f"{CONTAINER_HOST_PATH}/{rand_suffix}/k3s",
122
122
  "etc_path": f"{CONTAINER_HOST_PATH}/{rand_suffix}/etc",
123
123
  "node_labels": node_labels,
124
- "flannel_iface": DEFAULT_FLANNEL_IFACE if vpn_token is not None else ""
124
+ "flannel_iface": DEFAULT_FLANNEL_IFACE if vpn_token is not None else "",
125
+ "user_id": load_user_id()
125
126
  }
126
127
  # generate local config files
127
128
  compose_yaml = load_template(
@@ -148,7 +149,6 @@ def is_watcher_alive(server_creds, user_cookie, timeout=30):
148
149
  return True
149
150
 
150
151
 
151
-
152
152
  def load_server_info(data_key, file):
153
153
  try:
154
154
  with open(file, "r") as f:
@@ -157,10 +157,18 @@ def load_server_info(data_key, file):
157
157
  return None
158
158
 
159
159
  def load_user_session():
160
- return KALAVAI_AUTH.load_user_session()
160
+ if KALAVAI_USER_ID is None:
161
+ user_id = KALAVAI_AUTH.load_user_session()
162
+ else:
163
+ user_id = KALAVAI_USER_ID
164
+ return user_id
161
165
 
162
166
  def load_user_id():
163
- return KALAVAI_AUTH.get_user_id()
167
+ if KALAVAI_USER_ID is None:
168
+ user_id = KALAVAI_AUTH.get_user_id()
169
+ else:
170
+ user_id = KALAVAI_USER_ID
171
+ return user_id
164
172
 
165
173
  def get_public_seeds(user_only, user_cookie):
166
174
  return []
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: kalavai-client
3
- Version: 0.6.8
3
+ Version: 0.6.10
4
4
  Summary: Client app for kalavai platform
5
5
  License: Apache-2.0
6
6
  Keywords: LLM,platform
@@ -1,10 +1,10 @@
1
- kalavai_client/__init__.py,sha256=ybIqssynIyB7zG5xVOgYdLdkjkSMc5Kwtdb49R-Wp2g,22
1
+ kalavai_client/__init__.py,sha256=vHDA_1Wsc8bqniOeYrKHuU5fuCZ_w3-plFaYRacXd4Q,23
2
2
  kalavai_client/__main__.py,sha256=WQUfxvRsBJH5gsCJg8pLz95QnZIj7Ol8psTO77m0QE0,73
3
3
  kalavai_client/assets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
4
4
  kalavai_client/assets/apps.yaml,sha256=Wu2Pk3k4I_S3r_rW9bNDWMWIm5gzNpmz0K6agNH3YMg,6365
5
5
  kalavai_client/assets/apps_values.yaml,sha256=WRew3bS1MztjzcJfphuJcKn0n2T1ICRupPpr_Csjt_s,1644
6
6
  kalavai_client/assets/docker-compose-gui.yaml,sha256=DGCyGYzz1kH6kkMbo62FJHe3F9vcAmA8DOHw-c_o0Kw,752
7
- kalavai_client/assets/docker-compose-template.yaml,sha256=88Bi8mxynoK9lHi4d_yqaRVQCwbJfzkY8SUoYnEArRU,1589
7
+ kalavai_client/assets/docker-compose-template.yaml,sha256=Nz_JzeBnQCzPCyWP5cEQHFeZzPwQqqBJ3C_xrToWlMA,1654
8
8
  kalavai_client/assets/nginx.conf,sha256=drVVCg8GHucz7hmt_BI6giAhK92OV71257NTs3LthwM,225
9
9
  kalavai_client/assets/pool_config_template.yaml,sha256=fFz4w2-fMKD5KvyzFdfcWD_jSneRlmnjLc8hCctweX0,576
10
10
  kalavai_client/assets/pool_config_values.yaml,sha256=VrM3XHQfQo6QLZ68qvagooUptaYgl1pszniY_JUtemk,233
@@ -16,10 +16,10 @@ kalavai_client/bridge_models.py,sha256=IGPLAYEZG4f5EUtBuoR2u_cYoyCCVkhx4H2rMeGuJ
16
16
  kalavai_client/cli.py,sha256=tBn3l12XhOJF17cWeX84xm10HPG7rSzalyOyugzcLhw,46900
17
17
  kalavai_client/cluster.py,sha256=ojUBXp2bR3hVyikIEkiGDbXvQfhBXBSk_mCqLxvyP0c,12943
18
18
  kalavai_client/core.py,sha256=bi8r7Twh2aQEDNn1shySlwx4704KG1pDmgMSSkzA1qk,32641
19
- kalavai_client/env.py,sha256=wAd-P8XDlDB8Oau76f0bG2aHTkNA793xb_V0frbNeJE,2770
20
- kalavai_client/utils.py,sha256=k2Bpvl16zDpWBXMIMsd_LbkinZtctPO6bygfB7DyiZ8,12018
21
- kalavai_client-0.6.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
22
- kalavai_client-0.6.8.dist-info/METADATA,sha256=j06JF7kS9Mkuiz1tmhE2bVkAdLA5joRgq8rgXifbNyM,13353
23
- kalavai_client-0.6.8.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
24
- kalavai_client-0.6.8.dist-info/entry_points.txt,sha256=9T6D45gxwzfVbglMm1r6XPdXuuZdHfy_7fCeu2jUphc,50
25
- kalavai_client-0.6.8.dist-info/RECORD,,
19
+ kalavai_client/env.py,sha256=YsfZj7LWf6ABquDsoIFFkXCFYwenpDk8zVnGsf7qv98,2823
20
+ kalavai_client/utils.py,sha256=EmjWVLjTBILjw87_6ih_v5CbVqihsYHSKxfD-C_Z-es,12276
21
+ kalavai_client-0.6.10.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
22
+ kalavai_client-0.6.10.dist-info/METADATA,sha256=sRmVhRkTkXpWaY0UUJHGclAOZPdjX97GG9VkXI1wXFg,13354
23
+ kalavai_client-0.6.10.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
24
+ kalavai_client-0.6.10.dist-info/entry_points.txt,sha256=9T6D45gxwzfVbglMm1r6XPdXuuZdHfy_7fCeu2jUphc,50
25
+ kalavai_client-0.6.10.dist-info/RECORD,,