gibson-cli 0.1.6__py3-none-any.whl → 0.3.0__py3-none-any.whl

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/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/command/Code.py

@@ -6,7 +6,7 @@ from string import Template
 from gibson.api.Cli import Cli
 from gibson.command.BaseCommand import BaseCommand
 from gibson.command.Merge import Merge
-from gibson.command.Rewrite import Rewrite
+from gibson.command.rewrite.Rewrite import Rewrite
 from gibson.core.Configuration import Configuration
 from gibson.display.Header import Header
 from gibson.display.WorkspaceFooter import WorkspaceFooter
@@ -129,7 +129,7 @@ class Code(BaseCommand):
                     Merge(self.configuration).execute()
                     self.conversation.unmute()
 
-                    Rewrite(self.configuration, wipe=False).execute()
+                    Rewrite(self.configuration, wipe=False).write()
 
                 self.conversation.newline()
 

gibson/command/Import.py

@@ -5,7 +5,7 @@ from sqlalchemy.orm import sessionmaker
 
 from gibson.api.Cli import Cli
 from gibson.command.BaseCommand import BaseCommand
-from gibson.command.Rewrite import Rewrite
+from gibson.command.rewrite.Rewrite import Rewrite
 from gibson.db.TableExceptions import TableExceptions
 
 
@@ -48,7 +48,7 @@ class Import(BaseCommand):
         self.conversation.newline()
 
         if write_code:
-            Rewrite(self.configuration).execute()
+            Rewrite(self.configuration).write()
             self.conversation.newline()
 
         return True

gibson/command/Remove.py

@@ -2,7 +2,7 @@ import sys
 
 from gibson.api.Cli import Cli
 from gibson.command.BaseCommand import BaseCommand
-from gibson.command.Rewrite import Rewrite
+from gibson.command.rewrite.Rewrite import Rewrite
 
 
 class Remove(BaseCommand):
@@ -63,7 +63,7 @@ class Remove(BaseCommand):
         self.conversation.type(f"[Removed] {sys.argv[2]}\n")
         self.conversation.newline()
 
-        Rewrite(self.configuration, header="Refactoring").execute()
+        Rewrite(self.configuration, header="Refactoring").write()
 
         self.conversation.newline()
 

gibson/command/Rename.py

@@ -2,7 +2,7 @@ import sys
 
 from gibson.api.Cli import Cli
 from gibson.command.BaseCommand import BaseCommand
-from gibson.command.Rewrite import Rewrite
+from gibson.command.rewrite.Rewrite import Rewrite
 
 
 class Rename(BaseCommand):
@@ -53,7 +53,7 @@ class Rename(BaseCommand):
         self.conversation.type(f"[Renamed] {sys.argv[2]} -> {sys.argv[3]}\n")
         self.conversation.newline()
 
-        Rewrite(self.configuration, header="Refactoring").execute()
+        Rewrite(self.configuration, header="Refactoring").write()
 
         self.conversation.newline()
 

gibson/command/Version.py

@@ -4,5 +4,6 @@ from gibson.conf.Version import Version as VersionConf
 
 class Version(BaseCommand):
     def execute(self):
-        self.conversation.type(VersionConf.num)
+        self.conversation.type(f"{VersionConf.num}\n")
+        self.conversation.newline()
         return True

gibson/command/auth/Auth.py

@@ -3,6 +3,7 @@ import sys
 from gibson.command.auth.Login import Login
 from gibson.command.auth.Logout import Logout
 from gibson.command.BaseCommand import BaseCommand
+from gibson.core.Colors import argument, command, hint, subcommand
 
 
 class Auth(BaseCommand):
@@ -18,8 +19,10 @@ class Auth(BaseCommand):
 
     def usage(self):
         self.conversation.type(
-            f"usage: {self.configuration.command} auth login\n"
-            + f"   or: {self.configuration.command} auth logout\n"
+            f"usage: {command(self.configuration.command)} {subcommand('auth')} {argument('login')} {hint('login to Gibson')} \n"
+        )
+        self.conversation.type(
+            f"   or: {command(self.configuration.command)} {subcommand('auth')} {argument('logout')} {hint('logout of Gibson')}\n"
         )
         self.conversation.newline()
         exit(1)

gibson/command/auth/Login.py

@@ -5,16 +5,9 @@ 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`."
-            )
+        authenticated = self.configuration.login()
+        if authenticated:
+            self.conversation.message_login_success()
         else:
-            self.configuration.set_auth_tokens(access_token, refresh_token)
-            self.conversation.type(f"Welcome! You are now logged in.")
-
+            self.conversation.message_login_failure()
         self.conversation.newline()

gibson/command/auth/Logout.py

@@ -5,3 +5,4 @@ class Logout(BaseCommand):
     def execute(self):
         self.configuration.set_access_token(None)
         self.conversation.type(f"You are now logged out.")
+        self.conversation.newline()

gibson/command/{Base.py → rewrite/Base.py}

@@ -6,11 +6,6 @@ from gibson.dev.Dev import Dev
 
 class Base(BaseCommand):
     def execute(self):
-        entities = self.memory.recall_merged()
-        if len(entities) == 0:
-            self.conversation.cant_no_entities(self.configuration.project.name)
-            exit(1)
-
         time_keeper = TimeKeeper()
         dev = Dev(self.configuration)
 

gibson/command/{Models.py → rewrite/Models.py}

@@ -11,10 +11,6 @@ class Models(BaseCommand):
             for entity in self.memory.entities:
                 entities.append(entity["name"])
 
-        if len(entities) == 0:
-            self.conversation.cant_no_entities(self.configuration.project.name)
-            exit(1)
-
         time_keeper = TimeKeeper()
 
         cli = Cli(self.configuration)

gibson/command/rewrite/Rewrite.py

@@ -0,0 +1,124 @@
+import os
+import shutil
+import sys
+
+from gibson.core.Colors import arguments, command, hint, subcommand
+from gibson.core.Configuration import Configuration
+from gibson.core.TimeKeeper import TimeKeeper
+from gibson.services.code.customization.CustomizationManager import CustomizationManager
+
+from ..BaseCommand import BaseCommand
+from .Api import Api
+from .Base import Base
+from .Models import Models
+from .Schemas import Schemas
+from .Tests import Tests
+
+
+class Rewrite(BaseCommand):
+    def __init__(
+        self,
+        configuration: Configuration,
+        header="Writing Code",
+        wipe=True,
+        with_header=False,
+    ):
+        super().__init__(configuration)
+        self.wipe = wipe
+        self.with_header = with_header
+        self.arguments = ["api", "base", "models", "schemas", "tests"]
+
+    def execute(self):
+        if len(sys.argv) != 3:
+            self.write()
+        elif sys.argv[2] in self.arguments:
+            self.write(sys.argv[2])
+        else:
+            self.usage()
+
+    def write(self, argument=None):
+        if len(self.memory.recall_merged()) == 0:
+            self.conversation.cant_no_entities(self.configuration.project.name)
+            exit(1)
+
+        if self.with_header is True:
+            self.conversation.display_project(self.configuration.project.name)
+
+        customization_manager = CustomizationManager(self.configuration).preserve()
+
+        try:
+            if self.wipe is True:
+                for root, dirs, files in os.walk(
+                    os.path.expandvars(self.configuration.project.dev.base.path)
+                ):
+                    for file in files:
+                        os.unlink(os.path.join(root, file))
+
+                    for dir_ in dirs:
+                        shutil.rmtree(os.path.join(root, dir_))
+
+            self.conversation.type("Writing Code\n")
+
+            if argument is None or argument == "api":
+                time_keeper = TimeKeeper()
+                self.conversation.type("  API      ")
+                self.conversation.mute()
+                # Disable customization management here so we don't process this twice (see finally block)
+                Api(self.configuration).disable_customization_management().execute()
+                self.conversation.unmute()
+                self.conversation.type(time_keeper.get_display())
+                self.conversation.newline()
+
+            if argument is None or argument == "base":
+                time_keeper = TimeKeeper()
+                self.conversation.type("  Base     ")
+                self.conversation.mute()
+                Base(self.configuration).execute()
+                self.conversation.unmute()
+                self.conversation.type(time_keeper.get_display())
+                self.conversation.newline()
+
+            if argument is None or argument == "models":
+                time_keeper = TimeKeeper()
+                self.conversation.type("  Models   ")
+                self.conversation.mute()
+                Models(self.configuration).execute()
+                self.conversation.unmute()
+                self.conversation.type(time_keeper.get_display())
+                self.conversation.newline()
+
+            if argument is None or argument == "schemas":
+                time_keeper = TimeKeeper()
+                self.conversation.type("  Schemas  ")
+                self.conversation.mute()
+                Schemas(self.configuration).execute()
+                self.conversation.unmute()
+                self.conversation.type(time_keeper.get_display())
+                self.conversation.newline()
+
+            if argument is None or argument == "tests":
+                time_keeper = TimeKeeper()
+                self.conversation.type("  Tests    ")
+                self.conversation.mute()
+                Tests(self.configuration).execute()
+                self.conversation.unmute()
+                self.conversation.type(time_keeper.get_display())
+                self.conversation.newline()
+        finally:
+            customization_manager.restore()
+
+        if self.with_header is True:
+            self.conversation.newline()
+
+        return self
+
+    def usage(self):
+        self.conversation.display_project(self.configuration.project.name)
+        self.conversation.type(
+            f"usage: {command(self.configuration.command)} {subcommand('rewrite')} {hint('rewrite all code')} \n"
+        )
+        self.conversation.type(
+            f"   or: {command(self.configuration.command)} {subcommand('rewrite')} {arguments(self.arguments)} {hint('rewrite only the specified code')}\n"
+        )
+        self.conversation.newline()
+        exit(1)

gibson/command/{Schemas.py → rewrite/Schemas.py}

@@ -1,7 +1,7 @@
 from gibson.api.Cli import Cli
-from gibson.dev.Dev import Dev
 from gibson.command.BaseCommand import BaseCommand
 from gibson.core.TimeKeeper import TimeKeeper
+from gibson.dev.Dev import Dev
 
 
 class Schemas(BaseCommand):
@@ -11,10 +11,6 @@ class Schemas(BaseCommand):
             for entity in self.memory.entities:
                 entities.append(entity["name"])
 
-        if len(entities) == 0:
-            self.conversation.cant_no_entities(self.configuration.project.name)
-            exit(1)
-
         time_keeper = TimeKeeper()
 
         cli = Cli(self.configuration)

gibson/command/{Tests.py → rewrite/Tests.py}

@@ -1,7 +1,7 @@
 from gibson.api.Cli import Cli
-from gibson.dev.Dev import Dev
 from gibson.command.BaseCommand import BaseCommand
 from gibson.core.TimeKeeper import TimeKeeper
+from gibson.dev.Dev import Dev
 
 
 class Tests(BaseCommand):
@@ -11,10 +11,6 @@ class Tests(BaseCommand):
             for entity in self.memory.entities:
                 entities.append(entity["name"])
 
-        if len(entities) == 0:
-            self.conversation.cant_no_entities(self.configuration.project.name)
-            exit(1)
-
         time_keeper = TimeKeeper()
 
         cli = Cli(self.configuration)

gibson/core/Colors.py

@@ -0,0 +1,64 @@
+class Color:
+    BLACK = "\033[30m"
+    BLACK_BG = "\033[40m"
+    BLINK = "\033[5m"
+    BLINK2 = "\033[6m"
+    BLUE = "\033[34m"
+    BLUE_BG = "\033[44m"
+    BLUE_BG2 = "\033[104m"
+    BLUE2 = "\033[94m"
+    BOLD = "\033[1m"
+    CYAN = "\033[36m"
+    CYAN_BG = "\033[46m"
+    CYAN_BG2 = "\033[106m"
+    CYAN2 = "\033[96m"
+    END = "\033[0m"
+    GREEN = "\033[32m"
+    GREEN_BG = "\033[42m"
+    GREEN_BG2 = "\033[102m"
+    GREEN2 = "\033[92m"
+    GREY = "\033[90m"
+    GREY_BG = "\033[100m"
+    ITALIC = "\033[3m"
+    RED = "\033[31m"
+    RED_BG = "\033[41m"
+    RED_BG2 = "\033[101m"
+    RED2 = "\033[91m"
+    SELECTED = "\033[7m"
+    UNDERLINE = "\033[4m"
+    VIOLET = "\033[35m"
+    VIOLET_BG = "\033[45m"
+    VIOLET_BG2 = "\033[105m"
+    VIOLET2 = "\033[95m"
+    WHITE = "\033[37m"
+    WHITE_BG = "\033[47m"
+    WHITE_BG2 = "\033[107m"
+    WHITE2 = "\033[97m"
+    YELLOW = "\033[33m"
+    YELLOW_BG = "\033[43m"
+    YELLOW_BG2 = "\033[103m"
+    YELLOW2 = "\033[93m"
+
+
+def colorize(text, color):
+    return f"{color}{text}{Color.END}"
+
+
+def command(text):
+    return colorize(text, Color.GREEN)
+
+
+def subcommand(text):
+    return colorize(text, Color.YELLOW)
+
+
+def argument(text):
+    return colorize(text, Color.VIOLET)
+
+
+def arguments(list):
+    return f"[{'|'.join(map(lambda x: argument(x), list))}]"
+
+
+def hint(text):
+    return colorize(text, Color.GREY)

gibson/core/CommandRouter.py

@@ -1,8 +1,6 @@
 import sys
 
-from gibson.command.Api import Api
 from gibson.command.auth.Auth import Auth
-from gibson.command.Base import Base
 from gibson.command.Build import Build
 from gibson.command.Code import Code
 from gibson.command.Conf import Conf
@@ -13,7 +11,6 @@ from gibson.command.Import import Import
 from gibson.command.List import List
 from gibson.command.Merge import Merge
 from gibson.command.Model import Model
-from gibson.command.Models import Models
 from gibson.command.Modify import Modify
 from gibson.command.Module import Module
 from gibson.command.New import New
@@ -21,12 +18,15 @@ from gibson.command.OpenApi import OpenApi
 from gibson.command.Question import Question
 from gibson.command.Remove import Remove
 from gibson.command.Rename import Rename
-from gibson.command.Rewrite import Rewrite
+from gibson.command.rewrite.Api import Api
+from gibson.command.rewrite.Base import Base
+from gibson.command.rewrite.Models import Models
+from gibson.command.rewrite.Rewrite import Rewrite
+from gibson.command.rewrite.Schemas import Schemas
+from gibson.command.rewrite.Tests import Tests
 from gibson.command.Schema import Schema
-from gibson.command.Schemas import Schemas
 from gibson.command.Show import Show
 from gibson.command.Test import Test
-from gibson.command.Tests import Tests
 from gibson.command.Tree import Tree
 from gibson.command.Version import Version
 from gibson.command.WarGames import WarGames
@@ -49,18 +49,10 @@ class CommandRouter:
             dev_on = "*"
 
         commands = {
-            "api": {
-                "description": "write the API code for the project",
-                "memory": "stored",
-            },
             "auth": {
                 "description": "login | logout",
                 "memory": None,
             },
-            "base": {
-                "description": "write the base code for the project",
-                "memory": "stored",
-            },
             "build": {
                 "description": "create the entities in the datastore",
                 "memory": "stored",
@@ -96,10 +88,6 @@ class CommandRouter:
                 "description": "write the model code for an entity",
                 "memory": "stored",
             },
-            "models": {
-                "description": "write all the model code",
-                "memory": "stored",
-            },
             "modify": {
                 "description": "change an entity using natural language",
                 "memory": "last > stored",
@@ -116,26 +104,18 @@ class CommandRouter:
                 "memory": "last > stored",
             },
             "rewrite": {
-                "description": "rewrite all code from scratch",
+                "description": "rewrite code",
                 "memory": "stored",
             },
             "schema": {
                 "description": "write the schema code for an entity",
                 "memory": "stored",
             },
-            "schemas": {
-                "description": "write all the schema code",
-                "memory": "stored",
-            },
             "show": {"description": "display an entity", "memory": "last > stored"},
             "test": {
                 "description": "write the unit tests for an entity",
                 "memory": "stored",
             },
-            "tests": {
-                "description": "write all the unit tests",
-                "memory": "stored",
-            },
             "tree": {"description": "illustrate the project layout", "memory": None},
             "? | q": {"description": "ask a question", "memory": None},
         }
@@ -187,12 +167,8 @@ class CommandRouter:
         Env().verify(self.configuration)
 
         command = None
-        if sys.argv[1] == "api":
-            command = Api(self.configuration)
-        elif sys.argv[1] == "auth":
+        if sys.argv[1] == "auth":
             command = Auth(self.configuration)
-        elif sys.argv[1] == "base":
-            command = Base(self.configuration)
         elif sys.argv[1] == "build":
             command = Build(self.configuration)
         elif sys.argv[1] == "code":
@@ -213,8 +189,6 @@ class CommandRouter:
             command = Merge(self.configuration)
         elif sys.argv[1] == "model":
             command = Model(self.configuration)
-        elif sys.argv[1] == "models":
-            command = Models(self.configuration)
         elif sys.argv[1] == "modify":
             command = Modify(self.configuration)
         elif sys.argv[1] == "module":
@@ -231,14 +205,10 @@ class CommandRouter:
             command = Rewrite(self.configuration, with_header=True)
         elif sys.argv[1] == "schema":
             command = Schema(self.configuration)
-        elif sys.argv[1] == "schemas":
-            command = Schemas(self.configuration)
         elif sys.argv[1] == "show":
             command = Show(self.configuration)
         elif sys.argv[1] == "test":
             command = Test(self.configuration)
-        elif sys.argv[1] == "tests":
-            command = Tests(self.configuration)
         elif sys.argv[1] == "tree":
             command = Tree(self.configuration)
         elif sys.argv[1] in ["?", "q"]:

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/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/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,12 +64,17 @@ __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" ;;
+    rewrite) __gibson_generate_completion "api base models schemas tests" ;;
     # 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" ;;
     esac
 
     return 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/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/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.dist-info → gibson_cli-0.3.0.dist-info}/METADATA

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

{gibson_cli-0.1.6.dist-info → gibson_cli-0.3.0.dist-info}/RECORD

@@ -1,41 +1,41 @@
 bin/build.sh,sha256=H3TAd349BECbcK3_t_jW9VzoLInMNrXtaLnXMEVanew,49
 bin/release.sh,sha256=LxPqH5kxhLKvzHaPRLBlq_ApaK7FHEteH4SzeRenidk,49
-gibson/api/BaseApi.py,sha256=SgEsVvEJ0t4U2jwJ-dp6YLVdBjh15pAOuT_wPQYn_v0,3233
-gibson/api/Cli.py,sha256=WT2EvEwUJgfM2klxKBSMaDFWrO1maImo9LSeJM4-Eho,7146
+gibson/api/BaseApi.py,sha256=l_EsHdKRz-cXGXd3Ju5IFwmCRUkunba6ckB957S9DAk,2696
+gibson/api/Cli.py,sha256=n2mmhZs1MFKhrDRVRWkDeHJtsun5ZwGfpTWpPngpkKE,7160
 gibson/bin/gibson.py,sha256=N1mAWaww9pw8s5u0et87FC5cFHVU6JzN4Kls3lDn-xw,354
-gibson/command/Api.py,sha256=sSvAqEJXdgQjYcu0uiM6ndHE3GnfkfVL6eqP2Otkbww,1002
-gibson/command/Base.py,sha256=eqp9e3XlCpGt4j_aR2htsQnICgkZT6GWeQblCFM792g,819
 gibson/command/BaseCommand.py,sha256=mmWUO0FxjMCbv3cHWnnasfAWnU_hTuGHUsRVJ4hUcqM,777
 gibson/command/Build.py,sha256=ATKN6HJs5egheDKJ_7eYxuxdYLDJHEZjEZLZ5bdlS54,2571
-gibson/command/Code.py,sha256=7ToeAWcB0JsjQE76VJyLC-KJGN3wwZY_ag8XQB6yPbQ,6824
+gibson/command/Code.py,sha256=02zg8YrOMZPap_7d_IgXzTWKnuiKSRObWNRE65D1fZQ,6830
 gibson/command/Conf.py,sha256=Wy8ybYAAnEtO6qPUyhVPAZdMayI0GHZNjMDTKSaIKsU,2390
 gibson/command/Count.py,sha256=xsYPRXP8TrW0T8P6uhjuovc28oR2iQgukL81eLoMpOc,976
 gibson/command/Dev.py,sha256=Vc9gnJ2gl_vmlS51Wksk7z46I4i3MGkEAS3ZCg-aEI0,4238
 gibson/command/Forget.py,sha256=iM8SdUMMdiw8Vbn3bJ6dgdnNXg-MIt3VM4G1ix3Kei4,1058
-gibson/command/Import.py,sha256=g-047rI3WbfIN0bovSq16zy7V-opRQUWYKLURl8lgyI,3690
+gibson/command/Import.py,sha256=8atZJKqrEuJwIwh-AU_YmcFYdT46d_QazOxwR3pI9_w,3696
 gibson/command/List.py,sha256=QgY2ycBxd6-z-qwXJ6JbCL1W_E0EiwAC8lTYCZ-Xgvg,2174
 gibson/command/Merge.py,sha256=zJme8FIVbabJCPFhRjR1J3R7TDoqtGJtLsnErkx5Uw0,1089
 gibson/command/Model.py,sha256=wBGBCdTJo7Y1nSzGyFbXuoV6vSNQVYm5V8I9CPuYuV8,1229
-gibson/command/Models.py,sha256=I_OdeN0n-CSsc7-EnHKskeq7RNs76QYrN8aMdnbxrZY,931
 gibson/command/Modify.py,sha256=y1rnHW9UEe9Y2u6xDy1tmO-ys4kZLSGyknlhzPsXqdE,1276
 gibson/command/Module.py,sha256=ZaiRiv_kVCRpWwwpDyDrvloocwH_wcL0XXyRldIpj00,1280
 gibson/command/New.py,sha256=aiWzoZc3Zj7OC2GhnS4pzPHZ-sduDV1-TOng2giE7TM,1157
 gibson/command/OpenApi.py,sha256=c9LM_sXJr5W7hInur02kNGbUK9i3ZBROzKgy_oThXWI,4341
 gibson/command/Question.py,sha256=bfAkfhSdNAfFqWp18Nv4CzdtFTCDW5BQaLxEci6V8H0,3748
-gibson/command/Remove.py,sha256=RWgERQ2IlnH-NduMzBYZun2_pHUvC9UsJXehibPuMRI,2392
-gibson/command/Rename.py,sha256=OYF0h3YDPycUrny-K8IOZjCEUEa9H4RtRbuIjTka-g4,2220
-gibson/command/Rewrite.py,sha256=IfKdMOmHYy_oXBASXLwBftUIwDc-yZKi1P6A1u3iyZM,3132
+gibson/command/Remove.py,sha256=bM3G-1iRU_7OdaGBTCGmTTEtScVWnptc5aHMvUnAY5k,2398
+gibson/command/Rename.py,sha256=TSwGTPBAmWE06SMtCtg6TX9aBNOX--kiiTS-0xj-epY,2226
 gibson/command/Schema.py,sha256=w47Z2klLAUSGx8Ln6iCWCVuZtz6cHBMc_i4ru7DqhyI,1233
-gibson/command/Schemas.py,sha256=QHuRG0PIYFuZqa-lSZ6KXTHcqrI_TuK9nZid6YaqepM,934
 gibson/command/Show.py,sha256=oNGKeNfEo6Qz1n4rJIRjlLuHWHWs5lB0TWE8Vn3hE2U,1190
 gibson/command/Test.py,sha256=7M7zVo9_dPGZ_hWlN9HcvuqHdpw1-Lc4--eK2fS7j10,1228
-gibson/command/Tests.py,sha256=4aMGYCn-VQ5anQdPMDR6cNSR9I3LvMDywplXBWNmfas,931
 gibson/command/Tree.py,sha256=JWvUimeHWY5-6vEh6axTkhAdI-dVTxbKSjx_4isAAx8,3041
-gibson/command/Version.py,sha256=Dbi1Mg56oRahWF-hxfCGFwRUli7vYguoCKKkJv-c7MI,227
+gibson/command/Version.py,sha256=4St_HMM_ub8CHG61Zh2UZPzXawNabmtlRHZdvekdfd8,270
 gibson/command/WarGames.py,sha256=V0KIpz-Z546qtQaOPdIVHQ6wp2n3r3M3tgKx-GRQzzU,1300
-gibson/command/auth/Auth.py,sha256=7R4Xt9NrkkSg8yYZeWi0VdhqCCK8ved2JUBdCbrMMZ8,717
-gibson/command/auth/Login.py,sha256=QpIQirzCAl_bDfV7zZLZKJIj2NGqTzmr6PDN000DIfI,746
-gibson/command/auth/Logout.py,sha256=9fs_iNdJdcdsE7q5Yi0XzqH_A0w8uqP34YZ6PWcZ3Pg,212
+gibson/command/auth/Auth.py,sha256=aOD5f4Ob9ZZ_eoodO2BgJ2-pNNE-BzoqwrYz-UGJHKo,956
+gibson/command/auth/Login.py,sha256=b43OfV76i6aGdOwj1NK64ZOdYlNyc08g3lZGQ_37KDw,437
+gibson/command/auth/Logout.py,sha256=V01q4TdbiBqCnIrM6IA4T25fO6ws0UpXp42I3pwHZVM,248
+gibson/command/rewrite/Api.py,sha256=sSvAqEJXdgQjYcu0uiM6ndHE3GnfkfVL6eqP2Otkbww,1002
+gibson/command/rewrite/Base.py,sha256=YJ2a5Hl0f9NXHUBBPvlt-dUIqEPWQz5vH6-1EHmbFbA,640
+gibson/command/rewrite/Models.py,sha256=eoUpZHpR0qwNgX60EWfcNz49GHmBw_FGfBuHH2ueZqY,799
+gibson/command/rewrite/Rewrite.py,sha256=1B6xRhWWXqZvwZND-pUtPeSW1AD_sWiec_jwAlFWdcg,4661
+gibson/command/rewrite/Schemas.py,sha256=zZ1gjmOJg77gh70t5y2WkzHWSAvEKx5-gqRN9OcsCXA,802
+gibson/command/rewrite/Tests.py,sha256=HO1WM6pSToVKsuJn7nUA_I5qrfBN0cgKgBzjlm2Qxt8,799
 gibson/command/tests/test_command_BaseCommand.py,sha256=hSbBfLFI3RTp_DdEHtm5oOLWoN6drI6ucFJypi7xxV8,364
 gibson/command/tests/test_command_Conf.py,sha256=NhN8tIZ_lwP0fV4jtplaxJbO3GTozsQVmiV5j1BNbxQ,583
 gibson/conf/Api.py,sha256=GM9okYs1A8ujPjDwzziOoQpqRYFkr-dz5pgkfb6j4DI,59
@@ -56,15 +56,16 @@ gibson/conf/dev/Model.py,sha256=HbHRX3VDxR7hXlzuxkKw4Bf7FH6XMfQ96k9BeIUoBf4,73
 gibson/conf/dev/Schema.py,sha256=kOSlX1jEyVb82xd8TO8jEAimLcaefIFJr6d2JYvyTqg,74
 gibson/conf/tests/test_conf_Dependencies.py,sha256=LITeeYiqXM5rKkyWFBqcnMvUR5pzDRuHVAngH372jWc,116
 gibson/conf/tests/test_conf_Platform.py,sha256=Zc53IsZmV-hT9VRrZEPNrsuehSdWnJXWKGMmOhEqWHo,138
-gibson/core/CommandRouter.py,sha256=jYKWpsCQGLjuCPkg7C8PPBnS07AddrUv3APTqB0s2C0,9558
+gibson/core/Colors.py,sha256=Us7C_SiPySogZABytlktw871gJGgETNFYcNeVyvtsjU,1363
+gibson/core/CommandRouter.py,sha256=7U9eUsEPTwKHZEdeCcMXB_qmDXx6X9wCY_OUPBRyt8M,8477
 gibson/core/Completions.py,sha256=N-mfeImSzw-d3Lrpu1KVnt0geMuKkbTaHpYTMYcPcAQ,1152
-gibson/core/Configuration.py,sha256=6EX8vh7qf15OB1hDfr2lYyKz6r-nB3KG0ltiax80_dU,14300
-gibson/core/Conversation.py,sha256=rKSfJao5VGj1WyWHjfbKnYqWS9j0fPmDCF5uX9e04zs,8196
+gibson/core/Configuration.py,sha256=-L1MS2gkXPEpTcuFCnpuMKIinvBgxdE02RhRh4fnccY,15633
+gibson/core/Conversation.py,sha256=gFP0fZCNiQ8K44qUQpAt9xokxJTft3_nfqiHmEoFlUE,8811
 gibson/core/Env.py,sha256=7HFKGah25KjLelyOjYS8ylR6yDScT6utyZe7HdB3aRE,431
 gibson/core/Memory.py,sha256=Anauq7vx883Bg5djoZCVyvAJBQeMtqQLzZtNecJMpZc,3921
 gibson/core/TimeKeeper.py,sha256=0mzs04wizjGEJbiQFWZyi4ja4XgeJaDqc0JzPCHp9po,250
 gibson/core/utils.py,sha256=KTnPvA3sUYnLFTZG7Tke5YEdls8Da0rNbeaOm8hapiU,408
-gibson/data/bash-completion.tmpl,sha256=d9oGeuTjD7Dm_rp5ojjcAyIxy8W_5rK7IPO60CyWMkw,2383
+gibson/data/bash-completion.tmpl,sha256=8XYbLMjyKlbaY4RVutxDqcwNLh5HNjTVDmZ3_Eci2xU,2726
 gibson/data/default-ref-table.tmpl,sha256=cVqjTsmHDjmTGrbDEpNHaDG-GX1iWMzsQDXk5TASEXg,123
 gibson/data/default-table.tmpl,sha256=4t7SmXBuZN4nV5SjuQp6PBdo0-c3hdRnl8TQ2wdaS3w,247
 gibson/db/TableExceptions.py,sha256=F1NGHDhusg9E_3tLez1_abrbANtWyR0UtC_wE9CwNFE,137
@@ -76,8 +77,8 @@ gibson/display/WorkspaceHeader.py,sha256=1oyyhZJF6C0SUCY2Cs_VkXt5Plp8xLb51XWa278
 gibson/display/tests/test_display_Header.py,sha256=I1GmB9RRa80rcYtgm3YXtpugdp5obca94zBVjmREYCY,324
 gibson/display/tests/test_display_WorkspaceFooter.py,sha256=96syJutXZWbGOLiAS5SkRZjwEAgj0E0t-uTT85BJe_w,359
 gibson/display/tests/test_display_WorkspaceHeader.py,sha256=9FuNLOkCAyFSDaonZbLQhLJSizc7bI2HAz3z1ifJlYs,316
-gibson/lang/Python.py,sha256=0QFqEFEmpRYB9ZpjbJZCAQFAg4eSAWg0bogDTaXpEgY,1680
-gibson/lang/tests/test_lang_Python.py,sha256=exebkaJXOQs6rtBf-5LSpbIARFb6oNqxT6oMWC2K2Tg,1968
+gibson/lang/Python.py,sha256=WNbCTFhDh9qXVbeySyfaP-6m-c0wllSCZw8A-r_Z0Oo,1764
+gibson/lang/tests/test_lang_Python.py,sha256=YpdqYOGAssg-jP9GuzfoU4Y4L7Boj0vAUAJgjuZvedo,1862
 gibson/services/auth/Server.py,sha256=j8pjO8R6AUeFJnK2GI9H-C5YQcMlg1rliR08H4qy_CI,1953
 gibson/services/code/context/schema/DataDictionary.py,sha256=zWLzxOzW8iMHxfXPEwnnbruEAtFa8j1UpghNd4AHzfA,369
 gibson/services/code/context/schema/EntityKeys.py,sha256=rmCABPloMckvzfq9Gwx6DRP-RdmEwXarkpMR4boIQwQ,1569
@@ -85,7 +86,7 @@ gibson/services/code/context/schema/Manager.py,sha256=I_xcPrcE2nFJmBEXcIoJQ9lxKf
 gibson/services/code/context/schema/tests/test_code_context_schema_DataDictionary.py,sha256=YkWrE1lzpR0amIeQC7lTUCSp54FRMGJrkfmu1FeOI7M,364
 gibson/services/code/context/schema/tests/test_code_context_schema_EntityKeys.py,sha256=i--xVPHNw7Ks8kkuv9GmSbpp0BuMMKTGtPBY1HwT-60,2114
 gibson/services/code/context/schema/tests/test_code_context_schema_Manager.py,sha256=FiQFpFmJjv9g46QjmBjGVF3yz1GF0Q42j0fvZm5ZOYw,1230
-gibson/services/code/customization/Authenticator.py,sha256=kbE-zXfUaY_8F9g3CCQrt5zPbcUMwumJbePHc_GLc0Y,1579
+gibson/services/code/customization/Authenticator.py,sha256=wSXKYyJQW129ImNe_ll_ecQct3Ql8tgvkbcCyoyNlBs,1597
 gibson/services/code/customization/BaseCustomization.py,sha256=9a3S6KQEVXevqIv7q9BrPTP-luB2FsM0ULkSxEkYVrs,293
 gibson/services/code/customization/CustomizationManager.py,sha256=wCwmN1S5lVQVsZyg2_Rwb7NW5kq-loWoJ466bUw6UVw,584
 gibson/services/code/customization/tests/test_code_customization_Authenticator.py,sha256=kKExkLfKPpRA2NQH3fvRCuBEMhCGhR-IvNJqXuyBz3c,1949
@@ -103,8 +104,8 @@ gibson/structure/tests/test_Entity.py,sha256=Gl9f1NcEKdpWCx4W3takFFzp18mLhCYWKrd
 gibson/tests/test_Env.py,sha256=DPWmP0-aEelducq9bAwv7rKoY2NjWXUeCrzfJDQkn2M,369
 gibson/tests/test_Memory.py,sha256=YP7owToABAk_-s7fD5UG0HTc4lamDjdA39JUlLnk3Fg,2574
 gibson/tests/test_utils.py,sha256=r_y-EG05YTCNtL8MWiAK1KmPsmeoMgypKsQC_lVgOtM,559
-gibson_cli-0.1.6.dist-info/METADATA,sha256=BNmzpINXYsNihyvepFKPWVxnCpigSLohhOu7I1vRIzI,11437
-gibson_cli-0.1.6.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-gibson_cli-0.1.6.dist-info/entry_points.txt,sha256=j5VUvq3AzL21xPvVC24zMoXFt-I5lUWulr66nL3OAPM,50
-gibson_cli-0.1.6.dist-info/top_level.txt,sha256=RFaUY7VXGiqkMwo1Rj7pM4kGvxkhhnfo-2LmPpuL_fs,11
-gibson_cli-0.1.6.dist-info/RECORD,,
+gibson_cli-0.3.0.dist-info/METADATA,sha256=VkuCt6nfzRP3AkFR1QtSmy-gbOG9-mkrrcM9bkm1sz4,11437
+gibson_cli-0.3.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+gibson_cli-0.3.0.dist-info/entry_points.txt,sha256=j5VUvq3AzL21xPvVC24zMoXFt-I5lUWulr66nL3OAPM,50
+gibson_cli-0.3.0.dist-info/top_level.txt,sha256=RFaUY7VXGiqkMwo1Rj7pM4kGvxkhhnfo-2LmPpuL_fs,11
+gibson_cli-0.3.0.dist-info/RECORD,,

gibson/command/Rewrite.py

@@ -1,107 +0,0 @@
-import os
-import shutil
-
-from gibson.core.Configuration import Configuration
-from gibson.core.TimeKeeper import TimeKeeper
-from gibson.services.code.customization.CustomizationManager import CustomizationManager
-
-from .Api import Api
-from .Base import Base
-from .BaseCommand import BaseCommand
-from .Models import Models
-from .Schemas import Schemas
-from .Tests import Tests
-
-
-class Rewrite(BaseCommand):
-    def __init__(
-        self,
-        configuration: Configuration,
-        header="Writing Code",
-        wipe=True,
-        with_header=False,
-    ):
-        super().__init__(configuration)
-        self.wipe = wipe
-        self.with_header = with_header
-
-    def execute(self):
-        if self.with_header is True:
-            self.conversation.display_project(self.configuration.project.name)
-
-        customization_manager = CustomizationManager(self.configuration).preserve()
-
-        try:
-            if self.wipe is True:
-                for root, dirs, files in os.walk(
-                    os.path.expandvars(self.configuration.project.dev.base.path)
-                ):
-                    for file in files:
-                        os.unlink(os.path.join(root, file))
-
-                    for dir_ in dirs:
-                        shutil.rmtree(os.path.join(root, dir_))
-
-            self.conversation.type("Writing Code\n")
-
-            time_keeper = TimeKeeper()
-
-            self.conversation.type("  API      ")
-
-            self.conversation.mute()
-            Api(self.configuration).disable_customization_management().execute()
-            self.conversation.unmute()
-
-            self.conversation.type(time_keeper.get_display())
-            self.conversation.newline()
-
-            time_keeper = TimeKeeper()
-
-            self.conversation.type("  Base     ")
-
-            self.conversation.mute()
-            Base(self.configuration).execute()
-            self.conversation.unmute()
-
-            self.conversation.type(time_keeper.get_display())
-            self.conversation.newline()
-
-            time_keeper = TimeKeeper()
-
-            self.conversation.type("  Models   ")
-
-            self.conversation.mute()
-            Models(self.configuration).execute()
-            self.conversation.unmute()
-
-            self.conversation.type(time_keeper.get_display())
-            self.conversation.newline()
-
-            time_keeper = TimeKeeper()
-
-            self.conversation.type("  Schemas  ")
-
-            self.conversation.mute()
-            Schemas(self.configuration).execute()
-            self.conversation.unmute()
-
-            self.conversation.type(time_keeper.get_display())
-            self.conversation.newline()
-
-            time_keeper = TimeKeeper()
-
-            self.conversation.type("  Tests    ")
-
-            self.conversation.mute()
-            Tests(self.configuration).execute()
-            self.conversation.unmute()
-
-            self.conversation.type(time_keeper.get_display())
-            self.conversation.newline()
-        finally:
-            customization_manager.restore()
-
-        if self.with_header is True:
-            self.conversation.newline()
-
-        return self