gibson-cli 0.7.4__py3-none-any.whl → 0.7.5__py3-none-any.whl

gibson/command/code/Entity.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import sys
 from string import Template
@@ -10,6 +12,7 @@ from gibson.command.code.Schema import Schema
 from gibson.command.code.Test import Test
 from gibson.command.Merge import Merge
 from gibson.core.Configuration import Configuration
+from gibson.core.Diff import additions, diff
 from gibson.core.Spinner import ComputingSpinner, Spinner
 from gibson.display.Header import Header
 from gibson.display.WorkspaceFooter import WorkspaceFooter
@@ -60,34 +63,15 @@ class Entity(BaseCommand):
 
         return True
 
-    def configure_definition(self):
-        existing_entity = self.memory.recall_entity(sys.argv[3])
-        if existing_entity is not None:
-            return existing_entity["definition"]
-
-        parts = sys.argv[3].split("_")
-        if len(parts) > 1 and parts[1] == "ref":
-            # This is a reference table implementation. We will handle this here.
-            with open(self.get_default_ref_table_template_path()) as f:
-                definition = Template(f.read()).substitute({"entity_name": sys.argv[3]})
-
-                self.memory.append_last({"definition": definition, "name": sys.argv[3]})
-
-                self.conversation.type(
-                    "Reference table created and stored in last memory. What's next?\n"
-                )
-                self.conversation.newline()
-
-                exit(1)
-
-        with open(self.get_default_table_template_path()) as f:
-            return Template(f.read()).substitute({"entity_name": sys.argv[3]})
-
     def execute(self):
         cli = Cli(self.configuration)
-
-        self.configuration.require_project()
-        definition = self.configure_definition()
+        entity_name = sys.argv[3]
+        existing_entity = self.memory.recall_entity(entity_name)
+        definition = (
+            existing_entity["definition"]
+            if existing_entity
+            else self.template_definition(entity_name)
+        )
 
         with ComputingSpinner():
             self.__context = CodeContextSchemaManager().from_code_writer_schema_context(
@@ -104,10 +88,19 @@ class Entity(BaseCommand):
                 .instantiate(self.configuration.project.datastore.type)
                 .import_from_struct(data)
             )
+            original_entity = entity if existing_entity else None
+            original_model_code = (
+                data["code"][0]["definition"] if existing_entity else None
+            )
 
         while True:
             try:
-                self.__render_workspace(entity, data["code"][0]["definition"])
+                self.__render_workspace(
+                    original_entity,
+                    entity,
+                    original_model_code,
+                    data["code"][0]["definition"],
+                )
                 input_ = input("> ")
                 if input_.lower() in [":q", ":q!", ":wq"]:
                     self.conversation.newline()
@@ -185,8 +178,24 @@ class Entity(BaseCommand):
             + "/default-table.tmpl"
         )
 
-    def __render_workspace(self, entity: StructureEntity, model):
+    def __render_workspace(
+        self,
+        original_entity: StructureEntity | None,
+        entity: StructureEntity,
+        original_model_code: str | None,
+        model_code: str,
+    ):
         self.configuration.platform.cmd_clear()
+        create_table_statement_diff = (
+            diff(original_entity.create_statement(), entity.create_statement())
+            if original_entity
+            else additions(entity.create_statement())
+        )
+        model_code_diff = (
+            diff(original_model_code, model_code)
+            if original_model_code
+            else additions(model_code)
+        )
 
         print("")
         print(WorkspaceHeader().render(self.configuration.project.name))
@@ -194,11 +203,29 @@ class Entity(BaseCommand):
         print("")
         print(Header().render("SQL", Colors.cyan))
         print("")
-        print(Colors.table(entity.create_statement(), entity.name))
+        print(Colors.table(create_table_statement_diff, entity.name))
 
         print("")
         print(Header().render("Model", Colors.yellow))
         print("")
-        print(Colors.model(model, entity.name))
-
+        print(Colors.model(model_code_diff, entity.name))
         print(WorkspaceFooter().render())
+
+    def template_definition(self, entity_name):
+        parts = entity_name.split("_")
+        if len(parts) > 1 and parts[1] == "ref":
+            # This is a reference table implementation. We will handle this here.
+            with open(self.get_default_ref_table_template_path()) as f:
+                definition = Template(f.read()).substitute({"entity_name": entity_name})
+
+                self.memory.append_last({"definition": definition, "name": entity_name})
+
+                self.conversation.type(
+                    "Reference table created and stored in last memory. What's next?\n"
+                )
+                self.conversation.newline()
+
+                exit(1)
+
+        with open(self.get_default_table_template_path()) as f:
+            return Template(f.read()).substitute({"entity_name": entity_name})

gibson/core/Diff.py

@@ -0,0 +1,34 @@
+from difflib import Differ
+
+from gibson.core.Colors import green, red
+
+
+# Highlights all lines as additions with a green + at the beginning
+# This keeps visual clutter to a minimum when showing the diff of an entirely new entity
+def additions(input: str):
+    lines = input.splitlines(keepends=True)
+    result = []
+    for line in lines:
+        result.append(f"{green('+')} {line}")
+    return "".join(result)
+
+
+# Highlights the diffs between two strings, showing the additions and removals as distinct colored lines
+def diff(original: str, modified: str):
+    diffs = list(
+        Differ().compare(
+            original.splitlines(keepends=True), modified.splitlines(keepends=True)
+        )
+    )
+
+    result = []
+    for line in diffs:
+        if line.startswith("+ "):
+            result.append(green(line))
+        elif line.startswith("- "):
+            result.append(red(line))
+        elif line.startswith("  "):
+            result.append(line)
+        # Ignore lines starting with '? ' as they are not needed for this highlighting
+
+    return "".join(result)

gibson/display/Header.py

@@ -1,9 +1,11 @@
 import math
 
+from gibson.core.Colors import bold
+
 
 class Header:
     def render(self, text, colorizer=None):
         output = text if colorizer is None else colorizer(text)
         half = math.floor((78 - len(text)) / 2)  # 80 line length - 2 spaces
-        header = "/" * half + f" {output} " + "/" * half
+        header = "/" * half + f" {bold(output)} " + "/" * half
         return header

gibson/display/WorkspaceHeader.py

@@ -5,7 +5,7 @@ class WorkspaceHeader:
     def render(self, project_name):
         return (
             f"Project {project_name}".ljust(50)
-            + " " * 12
-            + "[PAIR PROGRAMMER]\n"
+            + " " * 14
+            + f"{Colors.bold('PAIR PROGRAMMER')}\n"
             + "-" * 79
         ).replace(project_name, Colors.project(project_name))

gibson/display/tests/test_display_Header.py

@@ -5,8 +5,8 @@ from gibson.display.Header import Header
 def test_render():
     text = "abc def ghi"
     assert Header().render(text) == (
-        "///////////////////////////////// abc def ghi /////////////////////////////////"
+        f"///////////////////////////////// {Colors.bold(text)} /////////////////////////////////"
     )
     assert Header().render(text, Colors.red) == (
-        f"///////////////////////////////// {Colors.red(text)} /////////////////////////////////"
+        f"///////////////////////////////// {Colors.bold(Colors.red(text))} /////////////////////////////////"
     )

gibson/display/tests/test_display_WorkspaceHeader.py

@@ -4,6 +4,6 @@ from gibson.display.WorkspaceHeader import WorkspaceHeader
 
 def test_render():
     assert WorkspaceHeader().render("abc def ghi") == (
-        f"""Project {Colors.project("abc def ghi")}                                           [PAIR PROGRAMMER]
+        f"""Project {Colors.project("abc def ghi")}                                             {Colors.bold("PAIR PROGRAMMER")}
 -------------------------------------------------------------------------------"""
     )

{gibson_cli-0.7.4.dist-info → gibson_cli-0.7.5.dist-info}/METADATA

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

{gibson_cli-0.7.4.dist-info → gibson_cli-0.7.5.dist-info}/RECORD

@@ -26,7 +26,7 @@ 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=MJLGi-8a69X3KDMtXX8j6hsDvdhnI05fJUm3p2WfjN4,7779
+gibson/command/code/Entity.py,sha256=ZEDYiNRhg8CPI1GVei9gHMP-PpwcXrggXmhhEDPMPcc,8729
 gibson/command/code/Model.py,sha256=fEg0A-NjNLHx4I7-FoMVI5ClDf0UcCkKcti2Z-3rnwY,1340
 gibson/command/code/Models.py,sha256=eoUpZHpR0qwNgX60EWfcNz49GHmBw_FGfBuHH2ueZqY,799
 gibson/command/code/Schema.py,sha256=3f6iWoq6xzdj9NU3_WrByo7AUj0Tpo2CxtUzkIx73nQ,1346
@@ -69,6 +69,7 @@ gibson/core/CommandRouter.py,sha256=G_4_OToiBQUgvZbO_yuIqYGus0FtV_sk6s9LzGwR4RY,
 gibson/core/Completions.py,sha256=Bsh25vnf0pjpJA6MJNR_2MA2s58Ujj8XolR8fm8AQ_s,1197
 gibson/core/Configuration.py,sha256=sGqTRKoM0NaYuL9FKJ1oh5VttZRVshMCp5IgIHABtRA,15866
 gibson/core/Conversation.py,sha256=X9SeD9kBLmzEbZAOOTTZYV42HhHx-ud_HO_t20D33LA,10383
+gibson/core/Diff.py,sha256=onUJ5_0_S1vKAY_oFgX4vmwQo4byrnXLV4w7QSNA8fY,1071
 gibson/core/Env.py,sha256=08dZRHzzR0ahrbM4S0bXC7V1xhYQkT8Zefs00qUHf0U,498
 gibson/core/Memory.py,sha256=kAo9kFgsIAVrofTRepv81pw43Sl2zQrNFsfIy_yMb_w,4037
 gibson/core/PythonPath.py,sha256=p1q7n_5KnPvA8XbxJyvqC2vrIdEdTiMr6vRU9yj77Cs,1567
@@ -83,12 +84,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=A6KW4lgCrH67tqi7VrKucVn7lH-lJ-hd3yIauZxhv_A,292
+gibson/display/Header.py,sha256=OA-E2IWa7aBoHWrzuyrD8D4t-sXWXiF4J_1a9cUXtKk,335
 gibson/display/WorkspaceFooter.py,sha256=Mh18foAb33O1adnecLe7elIqBN8u2ewaSURl99qlcvE,415
-gibson/display/WorkspaceHeader.py,sha256=zqWa9xh3I8ky0ghYRmLdpUr4TXSBRyaIIyyVfYsfMQU,306
-gibson/display/tests/test_display_Header.py,sha256=gppahcCu3VXQMyIZiB_ixAS-ZygrTtkrx62IGFlWQOk,411
+gibson/display/WorkspaceHeader.py,sha256=143BCT724Ei8B1vF7mJ3iZ--OrE1ALBrrUAGMtxjogM,322
+gibson/display/tests/test_display_Header.py,sha256=q1iPm91shdoayqmtg81loFlTcivgQ1_O84cvWrviqOQ,433
 gibson/display/tests/test_display_WorkspaceFooter.py,sha256=HBcZ48UwEsJsNEXPcPH8UiuF0Wa15vffEkJILNhwPyw,471
-gibson/display/tests/test_display_WorkspaceHeader.py,sha256=8aY62ucD_YfP4DiqsWA3f_PZ9CNr096TuG1vUv0MoVE,373
+gibson/display/tests/test_display_WorkspaceHeader.py,sha256=QAbjAD89LK8dbTadAlAs1nXR5FjqaOZgQAv2SU3PHzU,390
 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
@@ -125,8 +126,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.4.dist-info/METADATA,sha256=Nx8vTtLVMaHx3zpI_G3Pi_Xl0VZ8KjdHTdj3MJLpnrI,13171
-gibson_cli-0.7.4.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-gibson_cli-0.7.4.dist-info/entry_points.txt,sha256=j5VUvq3AzL21xPvVC24zMoXFt-I5lUWulr66nL3OAPM,50
-gibson_cli-0.7.4.dist-info/top_level.txt,sha256=RFaUY7VXGiqkMwo1Rj7pM4kGvxkhhnfo-2LmPpuL_fs,11
-gibson_cli-0.7.4.dist-info/RECORD,,
+gibson_cli-0.7.5.dist-info/METADATA,sha256=OuHAiCEQTdnpRzDKYryR6kF4KpF54aUts77G46xMHvs,13171
+gibson_cli-0.7.5.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+gibson_cli-0.7.5.dist-info/entry_points.txt,sha256=j5VUvq3AzL21xPvVC24zMoXFt-I5lUWulr66nL3OAPM,50
+gibson_cli-0.7.5.dist-info/top_level.txt,sha256=RFaUY7VXGiqkMwo1Rj7pM4kGvxkhhnfo-2LmPpuL_fs,11
+gibson_cli-0.7.5.dist-info/RECORD,,