gibson-cli 0.3.1__tar.gz → 0.3.3__tar.gz

{gibson_cli-0.3.1/gibson_cli.egg-info → gibson_cli-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gibson-cli
-Version: 0.3.1
+Version: 0.3.3
 Summary: Gibson Command Line Interface
 Author-email: GibsonAI <noc@gibsonai.com>
 Project-URL: Homepage, https://gibsonai.com/

{gibson_cli-0.3.1 → gibson_cli-0.3.3}/gibson/core/Configuration.py

@@ -341,7 +341,18 @@ class Configuration:
         return self
 
     def login(self):
-        access_token, refresh_token = AuthServer(self.app_domain()).get_tokens()
+        server = AuthServer(self.app_domain())
+
+        self.conversation.newline()
+        self.conversation.type("We're opening your web browser to the login page.\n")
+        self.conversation.type("Please log in and then return to this window.\n")
+        self.conversation.type(
+            "If your browser does not open automatically, visit this URL:\n"
+        )
+        self.conversation.type(f"{server.get_url()}\n")
+        self.conversation.newline()
+
+        access_token, refresh_token = server.get_tokens()
         if access_token is None or refresh_token is None:
             return False
 

{gibson_cli-0.3.1 → gibson_cli-0.3.3}/gibson/core/Conversation.py

@@ -149,9 +149,6 @@ class Conversation:
         self.newline()
         self.type("First, let's get you logged in.\n")
         self.pause()
-        self.newline()
-        self.type("We're opening your web browser to the login page.\n")
-        self.type("Please log in and then return to this window.\n")
         return self
 
     def message_project_setup(self):

{gibson_cli-0.3.1 → gibson_cli-0.3.3}/gibson/services/auth/Server.py

@@ -1,9 +1,8 @@
-import webbrowser
 import time
-from http.server import HTTPServer, BaseHTTPRequestHandler
+import webbrowser
+from http.server import BaseHTTPRequestHandler, HTTPServer
 from threading import Thread
-from socket import socket
-from urllib.parse import urlparse, parse_qs
+from urllib.parse import parse_qs, urlparse
 
 
 # HTTP handler for processing the token sent from the web browser
@@ -38,11 +37,8 @@ class Server(HTTPServer):
     thread = None
 
     def __init__(self, app_domain: str):
-        sock = socket()
-        sock.bind(("", 0))
-        self.port = sock.getsockname()[1]
-        super().__init__(("localhost", self.port), Handler)
-
+        super().__init__(("localhost", 0), Handler)
+        self.port = self.server_address[1]
         self.app_domain = app_domain
 
     def get_tokens(self):
@@ -57,8 +53,11 @@ class Server(HTTPServer):
 
         return self.access_token, self.refresh_token
 
+    def get_url(self):
+        return f"{self.app_domain}/signup?cli={self.port}"
+
     def _open_browser(self):
-        webbrowser.open(f"{self.app_domain}/signup?cli={self.port}")
+        webbrowser.open(self.get_url())
 
     def _start(self):
         thread = Thread(target=self.serve_forever)

{gibson_cli-0.3.1 → gibson_cli-0.3.3/gibson_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gibson-cli
-Version: 0.3.1
+Version: 0.3.3
 Summary: Gibson Command Line Interface
 Author-email: GibsonAI <noc@gibsonai.com>
 Project-URL: Homepage, https://gibsonai.com/

{gibson_cli-0.3.1 → gibson_cli-0.3.3}/pyproject.toml

@@ -14,7 +14,7 @@ classifiers = [
   "Intended Audience :: Developers",
   "Programming Language :: Python :: 3.9",
 ]
-version = "0.3.1"
+version = "0.3.3"
 
 [tool.setuptools.packages.find]
 where = ["."]