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

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

@@ -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 → gibson_cli-0.3.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.3.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.1.6 → gibson_cli-0.3.0}/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_cli-0.1.6 → gibson_cli-0.3.0}/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_cli-0.1.6 → gibson_cli-0.3.0}/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_cli-0.1.6 → gibson_cli-0.3.0}/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_cli-0.1.6 → gibson_cli-0.3.0}/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_cli-0.1.6 → gibson_cli-0.3.0}/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_cli-0.3.0/gibson/command/auth/Login.py

@@ -0,0 +1,13 @@
+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.3.0}/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_cli-0.1.6/gibson/command → gibson_cli-0.3.0/gibson/command/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_cli-0.1.6/gibson/command → gibson_cli-0.3.0/gibson/command/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_cli-0.3.0/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_cli-0.1.6/gibson/command → gibson_cli-0.3.0/gibson/command/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_cli-0.1.6/gibson/command → gibson_cli-0.3.0/gibson/command/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_cli-0.3.0/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_cli-0.1.6 → gibson_cli-0.3.0}/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"]: