gibson-cli 0.7.1__py3-none-any.whl → 0.7.2__py3-none-any.whl

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

@@ -8,12 +8,12 @@ from gibson.dev.Dev import Dev
 
 
 class Model(BaseCommand):
-    def execute(self):
+    def execute(self, entity_name=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/command/code/Schema.py

@@ -8,12 +8,12 @@ from gibson.dev.Dev import Dev
 
 
 class Schema(BaseCommand):
-    def execute(self):
+    def execute(self, entity_name=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/command/code/Test.py

@@ -8,12 +8,12 @@ from gibson.dev.Dev import Dev
 
 
 class Test(BaseCommand):
-    def execute(self):
+    def execute(self, entity_name=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/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/display/Header.py

@@ -1,6 +1,10 @@
+import gibson.core.Colors as Colors
+
+
 class Header:
-    def render(self, text):
-        header = "+--------------------------------------------------------------+\n"
-        header += "| " + text + " " * (61 - len(text)) + "|\n"
-        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/display/WorkspaceFooter.py

@@ -1,10 +1,12 @@
+import gibson.core.Colors as Colors
+
+
 class WorkspaceFooter:
     def render(self):
         return (
             "=" * 79
             + "\n"
-            + "[. + enter = exit] "
-            + "[:q + enter = abort] "
-            + "[:w + enter = merge + write code]\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/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/display/tests/test_display_Header.py

@@ -1,9 +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                                                  |
-+--------------------------------------------------------------+"""
+        """+-----------------------------------------------------------------------------+
+| abc def ghi                                                                 |
++-----------------------------------------------------------------------------+"""
     )

gibson/display/tests/test_display_WorkspaceFooter.py

@@ -1,9 +1,11 @@
+import gibson.core.Colors as Colors
 from gibson.display.WorkspaceFooter import WorkspaceFooter
 
 
 def test_render():
     assert WorkspaceFooter().render() == (
-        """===============================================================================
-[. + enter = exit] [:q + enter = abort] [:w + enter = merge + write code]
+        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/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.dist-info → gibson_cli-0.7.2.dist-info}/METADATA

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

{gibson_cli-0.7.1.dist-info → gibson_cli-0.7.2.dist-info}/RECORD

@@ -26,12 +26,12 @@ gibson/command/auth/Logout.py,sha256=V01q4TdbiBqCnIrM6IA4T25fO6ws0UpXp42I3pwHZVM
 gibson/command/code/Api.py,sha256=sSvAqEJXdgQjYcu0uiM6ndHE3GnfkfVL6eqP2Otkbww,1002
 gibson/command/code/Base.py,sha256=YJ2a5Hl0f9NXHUBBPvlt-dUIqEPWQz5vH6-1EHmbFbA,640
 gibson/command/code/Code.py,sha256=Ce8jilFWl1B7Djabf4KoN3s8IgQPQchhxwOis0nFXvM,4234
-gibson/command/code/Entity.py,sha256=Gqmyhm9sALvVaUARi5QjreSSSj9UrG5KHGD5hkhQQ5E,6568
-gibson/command/code/Model.py,sha256=rJZfRMVbLgfcYRaWmEnzPe2B5hjnKwKDhuOZjkIEi6U,1087
+gibson/command/code/Entity.py,sha256=MQHtxu_dxd592XA8JYtcOkHeOKqgYC_O6dNbgGI2EMY,6937
+gibson/command/code/Model.py,sha256=UzJOmxgl0nEWRPuP_plKFpPmbFfW3uvur76Kv5QcjjA,1112
 gibson/command/code/Models.py,sha256=eoUpZHpR0qwNgX60EWfcNz49GHmBw_FGfBuHH2ueZqY,799
-gibson/command/code/Schema.py,sha256=VPoTOBsSpyy7g7JGTWMnS3j5ZDjOa4eojALEf3ZUR7o,1091
+gibson/command/code/Schema.py,sha256=aYp-MzNB6UPvtCvoGN0X1JZQ3QYN5ldHtlxb2kGKR08,1116
 gibson/command/code/Schemas.py,sha256=zZ1gjmOJg77gh70t5y2WkzHWSAvEKx5-gqRN9OcsCXA,802
-gibson/command/code/Test.py,sha256=5mamQpHWhSEd5RGEPkxOwyELSc-m3Wh5EJhiZPqvJpA,1082
+gibson/command/code/Test.py,sha256=JgUe5AB7xMw8tHnEaKqUCqRL895nlnwe34GRkOa6P0Y,1107
 gibson/command/code/Tests.py,sha256=HO1WM6pSToVKsuJn7nUA_I5qrfBN0cgKgBzjlm2Qxt8,799
 gibson/command/importer/Import.py,sha256=qW__kT7xruUgg2kTZG-80Jah94aqQ7nvd89dZW4uxcg,6792
 gibson/command/importer/OpenApi.py,sha256=voTthxb0KDTlkEsHsIeJnyMxgEBbJKw9VTKDyGehopI,3759
@@ -64,7 +64,7 @@ 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/Colors.py,sha256=VLlnhQTReqNnPL0VywOMQpNsyf6hZ2ndM-RvADrO39I,2106
+gibson/core/Colors.py,sha256=dGafcWxDrUV5BcHUdzH2xIlueZW6RgkhFyOWgZ0tfL4,2531
 gibson/core/CommandRouter.py,sha256=G_4_OToiBQUgvZbO_yuIqYGus0FtV_sk6s9LzGwR4RY,3227
 gibson/core/Completions.py,sha256=Bsh25vnf0pjpJA6MJNR_2MA2s58Ujj8XolR8fm8AQ_s,1197
 gibson/core/Configuration.py,sha256=c_YX0GFmiTIr4V0-2GmOuAipdq-WKO6QU2oHtPLP4iU,15784
@@ -82,12 +82,12 @@ gibson/data/postgresql/default-table.tmpl,sha256=4xON0XyY55OiZhZmJ4RemnKMNFLniuS
 gibson/db/TableExceptions.py,sha256=LGDPxAVjXmb0EJSFpHC6twHoFzv7nFsFzTj2DXNabQU,196
 gibson/db/tests/test_db_TableExceptions.py,sha256=tNzn6SybygWXSuj-3i_s6t9LOo1P8gI9S4wSz4UxeCk,312
 gibson/dev/Dev.py,sha256=O-GiMATpVd9kYHsVfbHaC-Omh17HQ8FalFQNelfxh2s,2544
-gibson/display/Header.py,sha256=moTxePVMNhtpeFtcI9EhnnLSK1gHIQiwYiWQtBPq_bY,298
-gibson/display/WorkspaceFooter.py,sha256=1-PsPtLcC7xUZLwufSSaVo9caXuyZEwfR_iZatxwHF4,316
-gibson/display/WorkspaceHeader.py,sha256=qBKtwdtO3jnbQYGwqXZH5ph4jpR9a9KEVUA63VN_zAU,216
-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=eY1ZigLecol5PfyVJSbrbU7N28fnWDpVBqckSYgirIg,316
+gibson/display/Header.py,sha256=Lx7C50pqJiBOo_UgnPXkqL1XhdM1zPFEeEg5CdvPyr0,453
+gibson/display/WorkspaceFooter.py,sha256=qMM-tu9ZPA1E_-uyvrt6rwqXMXMvg5vR817WXmdCEFU,408
+gibson/display/WorkspaceHeader.py,sha256=y05g_RyRWwTeJ5hPpCizYaT-oHWu7htjZwatY8Qo2Lg,306
+gibson/display/tests/test_display_Header.py,sha256=0UWumN0kHjuVYp-Sf707yZgzoMvYt5jUAfWuhoiWwh8,405
+gibson/display/tests/test_display_WorkspaceFooter.py,sha256=EmjK-Yc3uPPaQQKebo1SWt6rUmsPo2imWgpIVb_CLiU,464
+gibson/display/tests/test_display_WorkspaceHeader.py,sha256=bdfWVmnyLd6f28wL1zEANZglX32tz2zEIKvQf9qK-X4,373
 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=DfemWNZlZ3rDE6PsAAvDP0anK7czwhiadX6Wilo4agY,1936
@@ -124,8 +124,8 @@ gibson/structure/tests/test_structure_Entity.py,sha256=askl8w0p1uqET6HKBogJlRcPP
 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.7.1.dist-info/METADATA,sha256=BP2GeRJb4uKyFjdFptfn0Xgj-6RwE2Yf4HNH9-uHnWk,13142
-gibson_cli-0.7.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-gibson_cli-0.7.1.dist-info/entry_points.txt,sha256=j5VUvq3AzL21xPvVC24zMoXFt-I5lUWulr66nL3OAPM,50
-gibson_cli-0.7.1.dist-info/top_level.txt,sha256=RFaUY7VXGiqkMwo1Rj7pM4kGvxkhhnfo-2LmPpuL_fs,11
-gibson_cli-0.7.1.dist-info/RECORD,,
+gibson_cli-0.7.2.dist-info/METADATA,sha256=7B6rodHdoyquS6V_sR3QoLpYtlUk22S5UigseI_to74,13142
+gibson_cli-0.7.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+gibson_cli-0.7.2.dist-info/entry_points.txt,sha256=j5VUvq3AzL21xPvVC24zMoXFt-I5lUWulr66nL3OAPM,50
+gibson_cli-0.7.2.dist-info/top_level.txt,sha256=RFaUY7VXGiqkMwo1Rj7pM4kGvxkhhnfo-2LmPpuL_fs,11
+gibson_cli-0.7.2.dist-info/RECORD,,