gibson-cli 0.7.1__tar.gz → 0.7.3__tar.gz

{gibson_cli-0.7.1/gibson_cli.egg-info → gibson_cli-0.7.3}/PKG-INFO

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

{gibson_cli-0.7.1 → gibson_cli-0.7.3}/gibson/command/code/Entity.py

@@ -5,8 +5,10 @@ from string import Template
 import gibson.core.Colors as Colors
 from gibson.api.Cli import Cli
 from gibson.command.BaseCommand import BaseCommand
+from gibson.command.code.Model import Model
+from gibson.command.code.Schema import Schema
+from gibson.command.code.Test import Test
 from gibson.command.Merge import Merge
-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
@@ -106,29 +108,32 @@ class Entity(BaseCommand):
             self.__render_workspace(entity, data["code"][0]["definition"])
 
             input_ = input("> ")
-            if input_ in [".", ":q", ":w"]:
+            if input_ in [":q", ":q!", ":wq"]:
                 self.conversation.newline()
 
                 if input_ == ":q":
+                    self.conversation.type("Exiting without saving.\n")
+
+                if input_ in [":q", ":q!"]:
                     exit(1)
 
                 self.memory.remember_last({"entities": [data["entity"]]})
+                self.conversation.mute()
+                Merge(self.configuration).execute()
+                self.conversation.unmute()
 
-                if input_ == ".":
-                    self.conversation.type(
-                        "Damn we write good code. I stored this in last memory. "
-                        + "Your move.\n"
-                    )
-                else:
-                    self.conversation.mute()
-                    Merge(self.configuration).execute()
-                    self.conversation.unmute()
+                self.conversation.type("Entity saved! ✅\n\n")
+                self.conversation.type("Gibson is writing the code...\n\n")
 
-                    Rewrite(self.configuration, wipe=False).write()
+                Model(self.configuration).execute(entity.name)
+                Schema(self.configuration).execute(entity.name)
+                Test(self.configuration).execute(entity.name)
 
-                self.conversation.newline()
+                self.conversation.type(
+                    f"All code for the {Colors.violet(entity.name)} entity has been written 🎉\n\n"
+                )
 
-                exit(1)
+                exit()
             elif input_ == "":
                 continue
 
@@ -180,14 +185,13 @@ class Entity(BaseCommand):
         print(WorkspaceHeader().render(self.configuration.project.name))
 
         print("")
-        print(Header().render("SQL"))
+        print(Header().render("SQL", Colors.Color.CYAN))
         print("")
         print(Colors.table(entity.create_statement(), entity.name))
 
         print("")
-        print(Header().render("Model"))
+        print(Header().render("Model", Colors.Color.YELLOW))
         print("")
-        print(model)
+        print(Colors.model(model, entity.name))
 
-        print("")
         print(WorkspaceFooter().render())

{gibson_cli-0.7.1 → gibson_cli-0.7.3}/gibson/command/code/Model.py

@@ -8,12 +8,13 @@ from gibson.dev.Dev import Dev
 
 
 class Model(BaseCommand):
-    def execute(self):
+    def execute(self, entity_name=None):
+        entity_name = entity_name or sys.argv[3]
         self.configuration.require_project()
-        entity = self.memory.recall_stored_entity(sys.argv[3])
+        entity = self.memory.recall_stored_entity(entity_name)
         if entity is None:
             self.conversation.not_sure_no_entity(
-                self.configuration.project.name, sys.argv[3]
+                self.configuration.project.name, entity_name
             )
             exit(1)
 

{gibson_cli-0.7.1 → gibson_cli-0.7.3}/gibson/command/code/Schema.py

@@ -8,12 +8,13 @@ from gibson.dev.Dev import Dev
 
 
 class Schema(BaseCommand):
-    def execute(self):
+    def execute(self, entity_name=None):
+        entity_name = entity_name or sys.argv[3]
         self.configuration.require_project()
-        entity = self.memory.recall_stored_entity(sys.argv[3])
+        entity = self.memory.recall_stored_entity(entity_name)
         if entity is None:
             self.conversation.not_sure_no_entity(
-                self.configuration.project.name, sys.argv[3]
+                self.configuration.project.name, entity_name
             )
             exit(1)
 

{gibson_cli-0.7.1 → gibson_cli-0.7.3}/gibson/command/code/Test.py

@@ -8,12 +8,13 @@ from gibson.dev.Dev import Dev
 
 
 class Test(BaseCommand):
-    def execute(self):
+    def execute(self, entity_name=None):
+        entity_name = entity_name or sys.argv[3]
         self.configuration.require_project()
-        entity = self.memory.recall_stored_entity(sys.argv[3])
+        entity = self.memory.recall_stored_entity(entity_name)
         if entity is None:
             self.conversation.not_sure_no_entity(
-                self.configuration.project.name, sys.argv[3]
+                self.configuration.project.name, entity_name
             )
             exit(1)
 

{gibson_cli-0.7.1 → gibson_cli-0.7.3}/gibson/core/Colors.py

@@ -57,7 +57,7 @@ def subcommand(text):
 
 # Colorize an argument
 def argument(text):
-    return colorize(text, Color.VIOLET)
+    return violet(text)
 
 
 # Colorize a list of arguments
@@ -92,9 +92,36 @@ def link(text):
 
 # Colorize the table name in a SQL statement
 def table(sql, name):
-    return sql.replace(name, colorize(name, Color.VIOLET))
+    return sql.replace(name, violet(name))
+
+
+# Colorize the table name in model code
+def model(code, name):
+    return code.replace(
+        f'__tablename__ = "{name}"', f'__tablename__ = "{violet(name)}"'
+    )
 
 
 # Colorize a time/duration output
 def time(text):
     return colorize(text, Color.GREEN)
+
+
+def cyan(text):
+    return colorize(text, Color.CYAN)
+
+
+def green(text):
+    return colorize(text, Color.GREEN)
+
+
+def red(text):
+    return colorize(text, Color.RED)
+
+
+def violet(text):
+    return colorize(text, Color.VIOLET)
+
+
+def yellow(text):
+    return colorize(text, Color.YELLOW)

gibson_cli-0.7.3/gibson/display/Header.py

@@ -0,0 +1,10 @@
+import gibson.core.Colors as Colors
+
+
+class Header:
+    def render(self, text, color=None):
+        output = text if color is None else Colors.colorize(text, color)
+        header = "+-----------------------------------------------------------------------------+\n"
+        header += "| " + output + " " * (76 - len(text)) + "|\n"
+        header += "+-----------------------------------------------------------------------------+"
+        return header

gibson_cli-0.7.3/gibson/display/WorkspaceFooter.py

@@ -0,0 +1,12 @@
+import gibson.core.Colors as Colors
+
+
+class WorkspaceFooter:
+    def render(self):
+        return (
+            "=" * 79
+            + "\n"
+            + f"[{Colors.red(':q')} + enter = {Colors.red('discard')} changes] "
+            + f"[{Colors.green(':wq')} + enter = {Colors.green('save')} changes + write code]\n\n"
+            + "Using natural language, tell me how I can modify this entity."
+        )

{gibson_cli-0.7.1 → gibson_cli-0.7.3}/gibson/display/WorkspaceHeader.py

@@ -1,3 +1,6 @@
+import gibson.core.Colors as Colors
+
+
 class WorkspaceHeader:
     def render(self, project_name):
         return (
@@ -5,4 +8,4 @@ class WorkspaceHeader:
             + " " * 12
             + "[PAIR PROGRAMMER]\n"
             + "=" * 79
-        )
+        ).replace(project_name, Colors.project(project_name))

gibson_cli-0.7.3/gibson/display/tests/test_display_Header.py

@@ -0,0 +1,10 @@
+import gibson.core.Colors as Colors
+from gibson.display.Header import Header
+
+
+def test_render():
+    assert Header().render("abc def ghi") == (
+        """+-----------------------------------------------------------------------------+
+| abc def ghi                                                                 |
++-----------------------------------------------------------------------------+"""
+    )

gibson_cli-0.7.3/gibson/display/tests/test_display_WorkspaceFooter.py

@@ -0,0 +1,11 @@
+import gibson.core.Colors as Colors
+from gibson.display.WorkspaceFooter import WorkspaceFooter
+
+
+def test_render():
+    assert WorkspaceFooter().render() == (
+        f"""===============================================================================
+[{Colors.red(':q')} + enter = {Colors.red('discard')} changes] [{Colors.green(':wq')} + enter = {Colors.green('save')} changes + write code]
+
+Using natural language, tell me how I can modify this entity."""
+    )

{gibson_cli-0.7.1 → gibson_cli-0.7.3}/gibson/display/tests/test_display_WorkspaceHeader.py

@@ -1,8 +1,9 @@
+import gibson.core.Colors as Colors
 from gibson.display.WorkspaceHeader import WorkspaceHeader
 
 
 def test_render():
     assert WorkspaceHeader().render("abc def ghi") == (
-        """Project abc def ghi                                           [PAIR PROGRAMMER]
+        f"""Project {Colors.project("abc def ghi")}                                           [PAIR PROGRAMMER]
 ==============================================================================="""
     )

{gibson_cli-0.7.1 → gibson_cli-0.7.3/gibson_cli.egg-info}/PKG-INFO

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

{gibson_cli-0.7.1 → gibson_cli-0.7.3}/gibson_cli.egg-info/top_level.txt

@@ -1,4 +1,5 @@
 bin
+build
 dist
 gibson
 venv

{gibson_cli-0.7.1 → gibson_cli-0.7.3}/pyproject.toml

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

gibson_cli-0.7.1/gibson/display/Header.py

@@ -1,6 +0,0 @@
-class Header:
-    def render(self, text):
-        header = "+--------------------------------------------------------------+\n"
-        header += "| " + text + " " * (61 - len(text)) + "|\n"
-        header += "+--------------------------------------------------------------+"
-        return header

gibson_cli-0.7.1/gibson/display/WorkspaceFooter.py

@@ -1,10 +0,0 @@
-class WorkspaceFooter:
-    def render(self):
-        return (
-            "=" * 79
-            + "\n"
-            + "[. + enter = exit] "
-            + "[:q + enter = abort] "
-            + "[:w + enter = merge + write code]\n"
-            + "Using natural language, tell me how I can modify this entity."
-        )

gibson_cli-0.7.1/gibson/display/tests/test_display_Header.py

@@ -1,9 +0,0 @@
-from gibson.display.Header import Header
-
-
-def test_render():
-    assert Header().render("abc def ghi") == (
-        """+--------------------------------------------------------------+
-| abc def ghi                                                  |
-+--------------------------------------------------------------+"""
-    )

gibson_cli-0.7.1/gibson/display/tests/test_display_WorkspaceFooter.py

@@ -1,9 +0,0 @@
-from gibson.display.WorkspaceFooter import WorkspaceFooter
-
-
-def test_render():
-    assert WorkspaceFooter().render() == (
-        """===============================================================================
-[. + enter = exit] [:q + enter = abort] [:w + enter = merge + write code]
-Using natural language, tell me how I can modify this entity."""
-    )