gibson-cli 0.1.6__tar.gz → 0.2.0__tar.gz

{gibson_cli-0.1.6/gibson_cli.egg-info → gibson_cli-0.2.0}/PKG-INFO

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

{gibson_cli-0.1.6 → gibson_cli-0.2.0}/gibson/api/BaseApi.py

@@ -1,41 +1,18 @@
 import os
+
 import requests
 
 from gibson.core.Configuration import Configuration
 
 
 class BaseApi:
-    API_ENV = os.environ.get("GIBSONAI_API_ENV", "staging")
     VERSION = "v1"
 
     def __init__(self, configuration: Configuration):
         self.configuration = configuration
 
-    def api_domain(self):
-        domains = {
-            "local": "http://localhost:8000",
-            "staging": "https://staging-api.gibsonai.com",
-            "production": "https://api.gibsonai.com",
-        }
-        return domains[self.API_ENV]
-
-    def app_domain(self):
-        domains = {
-            "local": "http://localhost:5173",
-            "staging": "https://staging-app.gibsonai.com",
-            "production": "https://app.gibsonai.com",
-        }
-        return domains[self.API_ENV]
-
     def base_url(self):
-        return f"{self.api_domain()}/{self.VERSION}"
-
-    def client_id(self):
-        return {
-            "local": "9b0cbebd-3eb4-47be-89ac-4aa589316ff4",
-            "staging": "02459e16-f356-4c01-b689-59847ed04b0a",
-            "production": "da287371-240b-4b53-bfde-4b1581cca62a",
-        }[self.API_ENV]
+        return f"{self.configuration.api_domain()}/{self.VERSION}"
 
     def get(self, endpoint):
         r = requests.get(self.url(endpoint), headers=self.headers())
@@ -82,6 +59,7 @@ class BaseApi:
         )
 
         if r.status_code != 200:
+            self.configuration.set_auth_tokens(None, None)
             return False
 
         parsed = r.json()
@@ -96,12 +74,17 @@ class BaseApi:
         return f"{self.base_url()}/{endpoint}"
 
     def __raise_for_status(self, r):
+        if r.status_code == 401:
+            print("\n\nYou need to log in to continue. Please run:\n")
+            print("  gibson auth login\n\n")
+            print("and then try again.\n")
+            exit(1)
+
         try:
             r.raise_for_status()
         except:
             try:
                 message = r.json()
-
                 print("=" * 78)
                 print("Raw Response:\n")
                 print(message)

{gibson_cli-0.1.6 → gibson_cli-0.2.0}/gibson/api/Cli.py

@@ -1,6 +1,6 @@
 from gibson.core.Configuration import Configuration
-from gibson.lang.Python import Python
 from gibson.core.Memory import Memory
+from gibson.lang.Python import Python
 
 from .BaseApi import BaseApi
 
@@ -61,7 +61,7 @@ class Cli(BaseApi):
 
     def headers(self):
         headers = {
-            "X-Gibson-Client-ID": self.client_id(),
+            "X-Gibson-Client-ID": self.configuration.client_id(),
             "X-Gibson-API-Key": self.configuration.project.api.key,
         }
 

gibson_cli-0.2.0/gibson/command/auth/Login.py

@@ -0,0 +1,15 @@
+from gibson.api.BaseApi import BaseApi
+from gibson.command.BaseCommand import BaseCommand
+from gibson.services.auth.Server import Server as AuthServer
+
+
+class Login(BaseCommand):
+    def execute(self):
+        authenticated = self.configuration.login()
+
+        if authenticated:
+            self.conversation.message_login_success()
+        else:
+            self.conversation.message_login_failure()
+
+        self.conversation.newline()

{gibson_cli-0.1.6 → gibson_cli-0.2.0}/gibson/core/Configuration.py

@@ -6,11 +6,12 @@ import sys
 import time
 
 from gibson.conf.Dependencies import Dependencies
+from gibson.conf.Paths import ConfigPaths
 from gibson.conf.Platform import Platform
 from gibson.conf.Project import Project
-from gibson.conf.Paths import ConfigPaths
 from gibson.core.Completions import Completions
 from gibson.core.Conversation import Conversation
+from gibson.services.auth.Server import Server as AuthServer
 
 
 class Configuration:
@@ -37,6 +38,29 @@ class Configuration:
 
         Completions().write().install()
 
+    def api_domain(self):
+        domains = {
+            "local": "http://localhost:8000",
+            "staging": "https://staging-api.gibsonai.com",
+            "production": "https://api.gibsonai.com",
+        }
+        return domains[self.API_ENV]
+
+    def app_domain(self):
+        domains = {
+            "local": "http://localhost:5173",
+            "staging": "https://staging-app.gibsonai.com",
+            "production": "https://app.gibsonai.com",
+        }
+        return domains[self.API_ENV]
+
+    def client_id(self):
+        return {
+            "local": "9b0cbebd-3eb4-47be-89ac-4aa589316ff4",
+            "staging": "02459e16-f356-4c01-b689-59847ed04b0a",
+            "production": "da287371-240b-4b53-bfde-4b1581cca62a",
+        }[self.API_ENV]
+
     def append_project_to_conf(self, project_name, project_description):
         self.project.api.key = "FIXME"
         self.project.name = project_name
@@ -269,7 +293,7 @@ class Configuration:
 
     def get_my_settings(self):
         return self.settings[self.project.name]
-    
+
     def get_refresh_token(self):
         try:
             with open(f"{self.paths.auth}/{self.API_ENV}", "r") as f:
@@ -282,7 +306,15 @@ class Configuration:
 
     def initialize(self):
         self.conversation.message_welcome()
-        print("")
+
+        authenticated = self.login()
+        if authenticated is False:
+            self.conversation.message_login_failure()
+            exit(1)
+        else:
+            self.conversation.message_login_success()
+
+        self.conversation.message_project_setup()
         project_name = self.conversation.prompt_project()
         project_description = self.conversation.prompt_description(project_name)
 
@@ -308,6 +340,14 @@ class Configuration:
 
         return self
 
+    def login(self):
+        access_token, refresh_token = AuthServer(self.app_domain()).get_tokens()
+        if access_token is None or refresh_token is None:
+            return False
+
+        self.set_auth_tokens(access_token, refresh_token)
+        return True
+
     def read_config(self):
         try:
             with open(self.project.paths.config, "r") as f:

{gibson_cli-0.1.6 → gibson_cli-0.2.0}/gibson/core/Conversation.py

@@ -123,6 +123,16 @@ class Conversation:
         self.type('Last item of business, if you need help just type "gibson help".\n')
         return self
 
+    def message_login_failure(self):
+        self.newline()
+        self.type("Login failed, please try again.\n")
+        return self
+
+    def message_login_success(self):
+        self.newline()
+        self.type("Nice! You're now logged in.\n")
+        return self
+
     def message_new_project(self, project_name):
         self.type(
             f"\n{project_name} is going to be huge! Congratulations on the new project.\n\n"
@@ -134,11 +144,20 @@ class Conversation:
         print(pyfiglet.figlet_format("GibsonAI", font="big").rstrip(), end="")
         print(f"  ...CLI v{Version.num}...")
         self.newline()
+        self.type("Welcome to Gibson!\n")
         self.pause()
-        self.type("Welcome!\n\n")
+        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):
+        self.newline()
         self.type(
-            "Let's get you set up. Give me the name of the project you're working on.\n"
+            "Now let's set up your first project. Give me the name of the project you're working on.\n"
         )
         self.type(
             "Don't worry, once we get to know each other you'll be able to modify this\n"
@@ -182,7 +201,7 @@ class Conversation:
         self.newline()
 
     def pause(self):
-        time.sleep(2)
+        time.sleep(1)
 
     def project_already_exists(self, project_name):
         self.type(f'\nA project called "{project_name}" already exists.\n')

{gibson_cli-0.1.6 → gibson_cli-0.2.0}/gibson/data/bash-completion.tmpl

@@ -47,18 +47,16 @@ __gibson_commands_and_options() {
         tree
         q
     '
+    SHORT_OPTIONS='-v'
+    LONG_OPTIONS='--version'
+    OPTIONS="${SHORT_OPTIONS} ${LONG_OPTIONS}"
 
     case "${current_word}" in
-    -*) __gibson_options ;;
+    -*) __gibson_generate_completion "${OPTIONS}" ;;
     *) __gibson_generate_completion "${COMMANDS}" ;;
     esac
 }
 
-__gibson_options() {
-    OPTIONS='--version -v'
-    __gibson_generate_completion "${OPTIONS}"
-}
-
 __gibson_completions() {
     declare previous_word
     previous_word="${COMP_WORDS[COMP_CWORD - 1]}"
@@ -66,9 +64,14 @@ __gibson_completions() {
     case "${previous_word}" in
     gibson) __gibson_commands_and_options ;;
     auth) __gibson_generate_completion "login logout" ;;
-    # config) __gibson_generate_completion "set get" ;;
+    code) __gibson_generate_completion "entity" ;;
+    conf) __gibson_generate_completion "api::key code::custom::model::class code::custom::path datastore::uri" ;;
+    dev) __gibson_generate_completion "on off" ;;
+    forget) __gibson_generate_completion "stored last all" ;;
+    import) __gibson_generate_completion "api datastore" ;;
+    list) __gibson_generate_completion "entities" ;;
+    new) __gibson_generate_completion "project" ;;
     # create) __gibson_generate_completion "project module entity" ;;
-    # new) __gibson_generate_completion "project module entity" ;;
     # project) __gibson_generate_completion "create delete list" ;;
     # rename) __gibson_generate_completion "entity" ;;
     # rewrite) __gibson_generate_completion "api base models schemas tests" ;;

{gibson_cli-0.1.6 → gibson_cli-0.2.0}/gibson/lang/Python.py

@@ -43,10 +43,12 @@ class Python:
 
                 return path
 
-        raise RuntimeError(
-            "cannot make import path; please execute:\n\n"
-            + f"    export PYTHONPATH=$PYTHONPATH:{os_path}\n"
+        print(
+            "Cannot make import path. Please execute the following command in your terminal:\n\n"
         )
+        print(f"    export PYTHONPATH=$PYTHONPATH:{os_path}\n\n")
+        print("and then try again.\n")
+        exit(1)
 
     def make_python_path(self, path):
         pythonpath = os.environ["PYTHONPATH"].split(":")

{gibson_cli-0.1.6 → gibson_cli-0.2.0}/gibson/lang/tests/test_lang_Python.py

@@ -32,15 +32,10 @@ def test_define_python_path():
 
 
 def test_make_import_path_exceptions():
-    with pytest.raises(RuntimeError) as e:
+    with pytest.raises(SystemExit) as e:
         Python().make_import_path("/a/b/c")
 
-    assert str(e.value) == (
-        """cannot make import path; please execute:
-
-    export PYTHONPATH=$PYTHONPATH:/a/b/c
-"""
-    )
+    assert e.value.code == 1
 
 
 def test_make_import_path():

{gibson_cli-0.1.6 → gibson_cli-0.2.0}/gibson/services/code/customization/Authenticator.py

@@ -11,7 +11,7 @@ class Authenticator(BaseCustomization):
         self.__file_contents = None
 
     def __get_file_name(self):
-        return (
+        return os.path.expandvars(
             self.configuration.project.dev.api.path
             + "/"
             + self.configuration.project.dev.api.version

{gibson_cli-0.1.6 → gibson_cli-0.2.0/gibson_cli.egg-info}/PKG-INFO

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

{gibson_cli-0.1.6 → gibson_cli-0.2.0}/pyproject.toml

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

gibson_cli-0.1.6/gibson/command/auth/Login.py

@@ -1,20 +0,0 @@
-from gibson.api.BaseApi import BaseApi
-from gibson.command.BaseCommand import BaseCommand
-from gibson.services.auth.Server import Server as AuthServer
-
-
-class Login(BaseCommand):
-    def execute(self):
-        api = BaseApi(self.configuration)
-        access_token, refresh_token = AuthServer(api.app_domain()).get_tokens()
-
-        if access_token is None or refresh_token is None:
-            self.conversation.newline()
-            self.conversation.type(
-                "Login failed, please try again with `gibson auth login`."
-            )
-        else:
-            self.configuration.set_auth_tokens(access_token, refresh_token)
-            self.conversation.type(f"Welcome! You are now logged in.")
-
-        self.conversation.newline()