ellf-cli 4.0.142__tar.gz → 4.0.145__tar.gz

{ellf_cli-4.0.142/ellf_cli.egg-info → ellf_cli-4.0.145}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ellf-cli
-Version: 4.0.142
+Version: 4.0.145
 Summary: Ellf Command Line Interface
 Home-page: https://prodi.gy
 Author: ExplosionAI GmbH

{ellf_cli-4.0.142 → ellf_cli-4.0.145}/ellf_cli/about.json

@@ -1,7 +1,7 @@
 {
   "title": "Ellf CLI",
   "name": "ellf-cli",
-  "version": "4.0.142",
+  "version": "4.0.145",
   "summary": "Ellf Command Line Interface",
   "uri": "https://prodi.gy",
   "prog": "ellf",

{ellf_cli-4.0.142 → ellf_cli-4.0.145}/ellf_cli/auth.py

@@ -19,7 +19,7 @@ from ellf_broker_sdk import Client as BrokerClient
 from ellf_pam_sdk import AccessTokenCredential, Client
 from ellf_pam_sdk.models import ClusterReading
 
-from .config import RootConfig
+from .config import DEFAULT_PAM_HOST, RootConfig
 from .errors import (
     CLIError,
     EllfError,
@@ -192,10 +192,10 @@ class AuthStateImpl:
 
         settings = get_saved_settings()
         # Allow env var overrides (used by the assistant service container).
-        pam_host = os.environ.get("PTC_PAM_HOST") or settings.pam_host
-        broker_host = os.environ.get("PTC_BROKER_HOST") or settings.broker_host
-        if pam_host is None:
-            raise CLIError(Messages.E037)
+        pam_host = (
+            os.environ.get("ELLF_PAM_HOST") or settings.pam_host or DEFAULT_PAM_HOST
+        )
+        broker_host = os.environ.get("ELLF_BROKER_HOST") or settings.broker_host
         self._secrets = None
         self._broker_url = URL.parse(broker_host) if broker_host is not None else None
         self._pam_url = URL.parse(pam_host)
@@ -377,7 +377,7 @@ class AuthStateImpl:
     def get_api_token(self, force_refresh: bool = False) -> AccessTokenCredential:
         # Allow injecting a PAM JWT via env var (used by the assistant service
         # to authenticate ellf commands on behalf of the logged-in user).
-        env_token = os.environ.get("ELLF_API_TOKEN") or os.environ.get("PTC_API_TOKEN")
+        env_token = os.environ.get("ELLF_API_TOKEN")
         if env_token:
             return AccessTokenCredential(access_token=env_token)
         if (

{ellf_cli-4.0.142 → ellf_cli-4.0.145}/ellf_cli/config.py

@@ -10,6 +10,8 @@ from pydantic import BaseModel
 from .ty import JSONableDict
 from .util import APP_NAME, get_app_dir
 
+DEFAULT_PAM_HOST = "https://ellf.prodigy.run"
+
 
 def global_config_dir() -> Path:
     return Path(get_app_dir(APP_NAME))
@@ -36,7 +38,7 @@ class SavedSettings(BaseModel):
     task: UUID | None = None
     action: UUID | None = None
     agent: UUID | None = None
-    pam_host: str | None = None
+    pam_host: str | None = DEFAULT_PAM_HOST
     cluster_id: UUID | None = None
     recipes_file: str | None = None
 
@@ -48,7 +50,7 @@ class SavedSettings(BaseModel):
             task=None,
             action=None,
             agent=None,
-            pam_host=None,
+            pam_host=DEFAULT_PAM_HOST,
             cluster_id=None,
             recipes_file=None,
         )

{ellf_cli-4.0.142 → ellf_cli-4.0.145}/ellf_cli/ellf.json

@@ -1,7 +1,7 @@
 {
   "prog": "ellf",
   "help": "Ellf Command Line Interface.",
-  "version": "4.0.141",
+  "version": "4.0.144",
   "extra_key": "_extra",
   "commands": {
     "actions": {

{ellf_cli-4.0.142 → ellf_cli-4.0.145}/ellf_cli/messages.py

@@ -38,7 +38,6 @@ class Messages:
     E034 = "{code} {reason} for URL {url}"
     E035 = "Cluster host unset: use the config set-cluster-host command to provide a cluster URL"
     E036 = "Cluster ID unset"
-    E037 = "PAM host unset: use the config set-pam-host command to provide a PAM URL"
     E038 = "Could not find {noun}: {name_or_id}"
     E039 = "Authentication error: {message}"
     E040 = "Run {command} to log in"  # TODO: this could be better to include more scenarios?

{ellf_cli-4.0.142 → ellf_cli-4.0.145/ellf_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ellf-cli
-Version: 4.0.142
+Version: 4.0.145
 Summary: Ellf Command Line Interface
 Home-page: https://prodi.gy
 Author: ExplosionAI GmbH

{ellf_cli-4.0.142 → ellf_cli-4.0.145}/tests/test_config.py

@@ -7,7 +7,7 @@ from uuid import uuid4
 
 import pytest
 
-from ellf_cli.config import RootConfig, SavedSettings
+from ellf_cli.config import DEFAULT_PAM_HOST, RootConfig, SavedSettings
 
 
 class TestSavedSettings:
@@ -18,7 +18,7 @@ class TestSavedSettings:
         assert s.task is None
         assert s.action is None
         assert s.agent is None
-        assert s.pam_host is None
+        assert s.pam_host == DEFAULT_PAM_HOST
         assert s.cluster_id is None
         assert s.recipes_file is None