kleinkram 0.0.116__tar.gz → 0.0.117__tar.gz

{kleinkram-0.0.116 → kleinkram-0.0.117}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kleinkram
-Version: 0.0.116
+Version: 0.0.117
 Summary: A CLI for the ETH project kleinkram
 Project-URL: Homepage, https://github.com/leggedrobotics/kleinkram
 Project-URL: Issues, https://github.com/leggedrobotics/kleinkram/issues

{kleinkram-0.0.116 → kleinkram-0.0.117}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "kleinkram"
-version = "0.0.116"
+version = "0.0.117"
 authors = [
   { name="Johann Schwabe", email="jschwab@ethz.ch" },
 ]

{kleinkram-0.0.116 → kleinkram-0.0.117}/src/kleinkram/auth.py

@@ -72,6 +72,7 @@ class OAuthCallbackHandler(BaseHTTPRequestHandler):
             self.end_headers()
             self.wfile.write(b"Authentication successful. You can close this window.")
             return
+        print("here")
 
     def log_message(self, format, *args):
         pass
@@ -90,8 +91,8 @@ class AuthenticatedClient(httpx.Client):
         try:
             self.tokenfile = TokenFile()
             self._load_cookies()
-        except:
-            print("Not authenticated. Please run 'GTD login'.")
+        except Exception as e:
+            print(f"{self.tokenfile.endpoint} is not authenticated. Please run 'klein login'.")
 
     def _load_cookies(self):
         if self.tokenfile.isCliToken():
@@ -107,7 +108,7 @@ class AuthenticatedClient(httpx.Client):
         if not refresh_token:
             print("No refresh token found. Please login again.")
             raise Exception("No refresh token found.")
-        self.cookies.set(REFRESH_TOKEN, refresh_token,)
+        self.cookies.set(REFRESH_TOKEN, refresh_token, )
         response = self.post(
             "/auth/refresh-token",
         )
@@ -122,7 +123,7 @@ class AuthenticatedClient(httpx.Client):
             method, self.tokenfile.endpoint + url, *args, **kwargs
         )
         if (
-            url == "/auth/refresh-token"
+                url == "/auth/refresh-token"
         ) and response.status_code == 401:
             print("Refresh token expired. Please login again.")
             response.status_code = 403
@@ -137,30 +138,65 @@ class AuthenticatedClient(httpx.Client):
 client = AuthenticatedClient()
 
 
-def login(key: Annotated[str, typer.Option()] = None):
+def login(
+        key: Annotated[str, typer.Option()] = None,
+        open_browser: Annotated[bool, typer.Option()] = True,
+):
     tokenfile = TokenFile()
     if key:
         tokenfile.saveTokens(key)
     else:
-        print("Opening browser for authentication...")
-        webbrowser.open(tokenfile.endpoint + "/auth/google?state=cli")
+        url = tokenfile.endpoint + "/auth/google?state=cli"
 
-        print("Waiting for authentication to complete...")
-        auth_tokens = get_auth_tokens()
+        has_browser = True
+        try:
+            browser_available = webbrowser.get()
+            if not browser_available:
+                raise Exception("No web browser available.")
+        except Exception as e:
+            has_browser = False
 
-        if not auth_tokens:
-            print("Failed to get authentication tokens.")
-            return
+        if has_browser and open_browser:
+            webbrowser.open(url)
+            auth_tokens = get_auth_tokens()
+
+            if not auth_tokens:
+                print("Failed to get authentication tokens.")
+                return
 
-        tokenfile.saveTokens(auth_tokens)
+            tokenfile.saveTokens(auth_tokens)
+            print("Authentication complete. Tokens saved to ~/.kleinkram.json.")
+
+            return
 
-        print("Authentication complete. Tokens saved to tokens.json.")
+        print(f"Please open the following URL manually in your browser to authenticate: {url + '-no-redirect'}")
+        print("Enter the authentication token provided after logging in:")
+        manual_auth_token = input("Authentication Token: ")
+        manual_refresh_token = input("Refresh Token: ")
+        if manual_auth_token:
+            tokenfile.saveTokens({AUTH_TOKEN: manual_auth_token, REFRESH_TOKEN: manual_refresh_token})
+            print("Authentication complete. Tokens saved to tokens.json.")
+        else:
+            print("No authentication token provided.")
+        return
 
 
-def endpoint(endpoint: Annotated[str, typer.Argument()]):
+def setEndpoint(endpoint: Annotated[str, typer.Argument()]):
     tokenfile = TokenFile()
     tokenfile.endpoint = endpoint
     tokenfile.writeToFile()
+    print("Endpoint set to: " + endpoint)
+    if tokenfile.endpoint not in tokenfile.tokens:
+        print("No tokens found for this endpoint.")
+
+
+def endpoint():
+    tokenfile = TokenFile()
+    print("Current: " + tokenfile.endpoint)
+    print("Saved Tokens found for:")
+    for _endpoint, _ in tokenfile.tokens.items():
+        print(_endpoint)
+
 
 def setCliKey(key: Annotated[str, typer.Argument()]):
     tokenfile = TokenFile()

kleinkram-0.0.117/src/kleinkram/consts.py

@@ -0,0 +1 @@
+API_URL='https://api.datasets.leggedrobotics.com'

{kleinkram-0.0.116 → kleinkram-0.0.117}/src/kleinkram/main.py

@@ -1,3 +1,4 @@
+import sys
 from datetime import datetime, timedelta
 import os
 
@@ -10,7 +11,7 @@ from rich.table import Table
 
 from .helper import uploadFiles, expand_and_match
 
-from .auth import login, client, endpoint, setCliKey
+from .auth import login, client, endpoint, setCliKey, setEndpoint
 
 app = typer.Typer()
 projects = typer.Typer(name="projects")
@@ -33,6 +34,7 @@ app.add_typer(tagtypes)
 app.add_typer(tag)
 app.command()(login)
 app.command()(endpoint)
+app.command()(setEndpoint)
 app.command()(setCliKey)
 
 
@@ -426,8 +428,9 @@ def addTag(
             print("Failed to tag mission")
     except httpx.HTTPError as e:
         print(e)
-        print("Failed to tag mission"
-)
+        print("Failed to tag mission")
+        sys.exit(1)
+
 
 @tagtypes.command('list')
 def tagTypes(

kleinkram-0.0.116/src/kleinkram/consts.py

@@ -1,2 +0,0 @@
-API_URL = "http://localhost:3000"
-# API_URL = "https://api.datasets.leggedrobotics.com"