gibson-cli 0.5.0__py3-none-any.whl → 0.5.2__py3-none-any.whl

gibson/api/Cli.py

@@ -111,6 +111,7 @@ class Cli(BaseApi):
         r = self.put(
             "modeler/entity/modify",
             {
+                "datastore": {"type": self.configuration.project.datastore.type},
                 "entity": entity,
                 "modeler": {"version": modeler_version},
                 "modifications": modifications,

gibson/command/Help.py

@@ -56,8 +56,7 @@ class Help(BaseCommand):
                 "description": "change an entity using natural language",
                 "memory": "last > stored",
             },
-            "module": {"description": "create a new module", "memory": "last"},
-            "new": {"description": "start something new", "memory": None},
+            "new": {"description": "create something new", "memory": None},
             "openapi": {"description": "build from an OpenAPI spec", "memory": "last"},
             "remove": {
                 "description": "remove an entity from the project",

gibson/command/new/Module.py

@@ -0,0 +1,44 @@
+from gibson.api.Cli import Cli
+from gibson.command.BaseCommand import BaseCommand
+from gibson.core.Colors import argument, arguments, command, hint, subcommand
+
+
+class Module(BaseCommand):
+    def execute(self):
+        self.configuration.ensure_project()
+        module_name = self.conversation.prompt_module()
+
+        self.conversation.newline()
+        self.conversation.type(f"Generating new module: {argument(module_name)}\n")
+
+        cli = Cli(self.configuration)
+        response = cli.modeler_module(
+            self.configuration.project.modeler.version,
+            self.configuration.project.description,
+            module_name,
+        )
+
+        self.memory.remember_last(response)
+
+        self.conversation.newline()
+        self.conversation.type(
+            f"The following entities were created in your {argument('last')} memory:\n"
+        )
+
+        for entity in response["entities"]:
+            self.conversation.newline()
+            print(entity["definition"])
+
+        self.conversation.newline()
+        self.conversation.type(f"If you want to persist these new entities run:\n")
+        self.conversation.type(
+            f"{command(self.configuration.command)} {subcommand('merge')}\n"
+        )
+
+        self.conversation.newline()
+        self.conversation.type(
+            f"Afterwards, you can modify any of these entities by running:\n"
+        )
+        self.conversation.type(
+            f"{command(self.configuration.command)} {subcommand('modify')} {argument('[entity name]')} {input('[instructions]')}\n"
+        )

gibson/command/new/New.py

@@ -0,0 +1,32 @@
+import sys
+
+from gibson.command.BaseCommand import BaseCommand
+from gibson.command.new.Module import Module
+from gibson.command.new.Project import Project
+from gibson.core.Colors import argument, arguments, command, hint, subcommand
+
+
+class New(BaseCommand):
+    def execute(self):
+        if len(sys.argv) != 3:
+            self.usage()
+        elif sys.argv[2] == "project":
+            Project(self.configuration).execute()
+        elif sys.argv[2] == "module":
+            Module(self.configuration).execute()
+        else:
+            self.usage()
+
+    def usage(self):
+        self.configuration.display_project()
+        self.conversation.type(
+            f"usage: {command(self.configuration.command)} {subcommand('new')} {arguments(['project', 'module'])} {hint('create something new')}\n"
+        )
+        self.conversation.type(
+            f"       {command(self.configuration.command)} {subcommand('new')} {argument('project')} {hint('create a new project')}\n"
+        )
+        self.conversation.type(
+            f"       {command(self.configuration.command)} {subcommand('new')} {argument('module')} {hint('create a new module')}\n"
+        )
+        self.conversation.newline()
+        exit(1)

gibson/command/{New.py → new/Project.py}

@@ -1,18 +1,8 @@
-import sys
-
-from gibson.api.Cli import Cli
 from gibson.command.BaseCommand import BaseCommand
-from gibson.core.Colors import argument, command, hint, subcommand
 
 
-class New(BaseCommand):
+class Project(BaseCommand):
     def execute(self):
-        if len(sys.argv) != 3:
-            self.usage()
-
-        if sys.argv[2] != "project":
-            self.usage()
-
         self.conversation.new_project(self.configuration)
         project_name = self.conversation.prompt_project()
         if project_name in self.configuration.settings:
@@ -25,11 +15,3 @@ class New(BaseCommand):
         self.configuration.append_project_to_conf(project_name, project_description)
 
         self.conversation.configure_new_project(self.configuration)
-
-    def usage(self):
-        self.configuration.display_project()
-        self.conversation.type(
-            f"usage: {command(self.configuration.command)} {subcommand('new')} {argument('project')} {hint('create a new project')}\n"
-        )
-        self.conversation.newline()
-        exit(1)

gibson/core/CommandRouter.py

@@ -13,8 +13,7 @@ from gibson.command.List import List
 from gibson.command.Merge import Merge
 from gibson.command.Model import Model
 from gibson.command.Modify import Modify
-from gibson.command.Module import Module
-from gibson.command.New import New
+from gibson.command.new.New import New
 from gibson.command.OpenApi import OpenApi
 from gibson.command.Question import Question
 from gibson.command.Remove import Remove
@@ -75,8 +74,6 @@ class CommandRouter:
             command = Model(self.configuration)
         elif sys.argv[1] == "modify":
             command = Modify(self.configuration)
-        elif sys.argv[1] == "module":
-            command = Module(self.configuration)
         elif sys.argv[1] == "new":
             command = New(self.configuration)
         elif sys.argv[1] == "openapi":

gibson/core/Conversation.py

@@ -55,8 +55,9 @@ class Conversation:
         self.type(
             "\nI am so excited that we're building something new together. "
             + "You probably need\nto execute:\n\n"
-            + "  gibson conf api::key [API key]\n"
-            + "  gibson conf datastore::uri [datastore URI]\n\n"
+            + "  gibson conf api::key         [API key]\n"
+            + "  gibson conf datastore::type  [datastore type]\n"
+            + "  gibson conf datastore::uri   [datastore URI]\n\n"
             + "To finish setting things up.\n"
         )
         self.newline()
@@ -202,7 +203,7 @@ class Conversation:
         time.sleep(1)
 
     def project_already_exists(self, project_name):
-        self.type(f'\nA project called "{project_name}" already exists.\n')
+        self.type(f'\nA project named "{project_name}" already exists.\n')
         self.newline()
 
     def prompt_description(self, project_name):
@@ -212,6 +213,13 @@ class Conversation:
             if len(user_prompt) > 0:
                 return user_prompt
 
+    def prompt_module(self):
+        while True:
+            self.type("Module Name [a-z0-9] > ")
+            user_prompt = input("")
+            if re.search("^[a-z0-9]+$", user_prompt):
+                return user_prompt
+
     def prompt_project(self):
         while True:
             self.type("Project Name [A-Za-z0-9_-] > ")

gibson/data/bash-completion.tmpl

@@ -25,7 +25,6 @@ __gibson_commands_and_options() {
         code
         conf
         count
-        create
         dev
         forget
         help
@@ -36,8 +35,6 @@ __gibson_commands_and_options() {
         modify
         new
         openapi
-        project
-        question
         remove
         rename
         rewrite
@@ -65,12 +62,12 @@ __gibson_completions() {
     gibson) __gibson_commands_and_options ;;
     auth) __gibson_generate_completion "login logout" ;;
     code) __gibson_generate_completion "entity" ;;
-    conf) __gibson_generate_completion "api::key code::custom::model::class code::custom::path datastore::uri" ;;
+    conf) __gibson_generate_completion "api::key code::custom::model::class code::custom::path datastore::uri datastore::type" ;;
     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" ;;
+    new) __gibson_generate_completion "project module" ;;
     rewrite) __gibson_generate_completion "api base models schemas tests" ;;
     # create) __gibson_generate_completion "project module entity" ;;
     # project) __gibson_generate_completion "create delete list" ;;

{gibson_cli-0.5.0.dist-info → gibson_cli-0.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gibson-cli
-Version: 0.5.0
+Version: 0.5.2
 Summary: Gibson Command Line Interface
 Author-email: GibsonAI <noc@gibsonai.com>
 Project-URL: Homepage, https://gibsonai.com/
@@ -169,6 +169,7 @@ More languages and frameworks are in active development. If you do not see a ver
 
 ### Configuring Your Datastore
 
+`gibson conf datastore::type mysql`
 `gibson conf datastore::uri mysql+pymysql://[user]:[password]@[host]/[database name]`
 
 Note: Gibson currently only supports MySQL. Let us know if you need something else.

{gibson_cli-0.5.0.dist-info → gibson_cli-0.5.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 bin/build.sh,sha256=H3TAd349BECbcK3_t_jW9VzoLInMNrXtaLnXMEVanew,49
 bin/release.sh,sha256=LxPqH5kxhLKvzHaPRLBlq_ApaK7FHEteH4SzeRenidk,49
 gibson/api/BaseApi.py,sha256=l_EsHdKRz-cXGXd3Ju5IFwmCRUkunba6ckB957S9DAk,2696
-gibson/api/Cli.py,sha256=ZUB8679s2L1TDQVLrgjxNCT-W8rwnHH7BMD0WEyf6Xs,7815
+gibson/api/Cli.py,sha256=JlioOwE3oob_OY_cr6qis0QEINU1H68ZjkWEQiGhZ-4,7897
 gibson/bin/gibson.py,sha256=N1mAWaww9pw8s5u0et87FC5cFHVU6JzN4Kls3lDn-xw,354
 gibson/command/BaseCommand.py,sha256=mmWUO0FxjMCbv3cHWnnasfAWnU_hTuGHUsRVJ4hUcqM,777
 gibson/command/Build.py,sha256=eypLUpZb3bw9LJ3s4uANZNbMNhshj90g94iQTreY74w,2851
@@ -10,14 +10,12 @@ gibson/command/Conf.py,sha256=z7G-81GpPUGZxjuE0HJn3ltHBIScqy4-rzinLYCyiLA,2467
 gibson/command/Count.py,sha256=FInot7Wz-lClKM1gfKgZXwBVIsTR0Gde0cMjYrCitog,1086
 gibson/command/Dev.py,sha256=KXaWeAMGifrxb4uyBJ5W0v9XIYeG8_C1Dw8TiAeOlHE,4358
 gibson/command/Forget.py,sha256=2-XpPqzjqhdGvilMitZECVBegDzlV12kDiR0xrxEVyY,1064
-gibson/command/Help.py,sha256=vxPRL50uBpPSmut_5M_2bQyZUhkGjfIcV-XLjPKKV0s,4873
+gibson/command/Help.py,sha256=KoHukpEk_jLNxaNdM-n4R-dXj_VZub6x4xIXbTK1_wU,4794
 gibson/command/Import.py,sha256=4VeDtQNWf20j2tSvAMjU9r-gB05fD3hh6Mfxdp5B_oI,4174
 gibson/command/List.py,sha256=XNL0p3WvGCjuWeFD_24VO5d2sflXfkk_CvAbXrcOMYI,2318
 gibson/command/Merge.py,sha256=AKhyImy_MH8sy7m9Anh1SKBINvLrRmt91fFE4oVPg7k,1060
 gibson/command/Model.py,sha256=rare94DN7Cij4IizBscwl6TBQvQy_RkVt8SgnUBZW1I,1278
 gibson/command/Modify.py,sha256=jYx8ojVoecPAX_YasvpGGqq2d0dl2FfCB3WAlSxtdtM,1269
-gibson/command/Module.py,sha256=m2vEbYsZgb9H5jUsDcle4amoclvSMy1u75EVrARTy4I,1247
-gibson/command/New.py,sha256=YEnH9zVXGvSL5xb07EIimRWduBRYKpuBclZJyuT6T64,1179
 gibson/command/OpenApi.py,sha256=mdjgzDgJTu8aMuI1bojExEAstCQuFzhFCnutNSm9z14,4313
 gibson/command/Question.py,sha256=KHFDLI3ItIFg3Qeeamy_zaXSZQyFBXdl3LEr4iq8FOg,3986
 gibson/command/Remove.py,sha256=i-ofK_uQfkgrP63vYaBxDTIhzs_-4p0FFaqd3f4fJvo,2435
@@ -31,6 +29,9 @@ gibson/command/WarGames.py,sha256=V0KIpz-Z546qtQaOPdIVHQ6wp2n3r3M3tgKx-GRQzzU,13
 gibson/command/auth/Auth.py,sha256=JScajZ__oSo24jzFa5NccCgc4yKgxn0BI0dXPWE5bA4,1000
 gibson/command/auth/Login.py,sha256=b43OfV76i6aGdOwj1NK64ZOdYlNyc08g3lZGQ_37KDw,437
 gibson/command/auth/Logout.py,sha256=V01q4TdbiBqCnIrM6IA4T25fO6ws0UpXp42I3pwHZVM,248
+gibson/command/new/Module.py,sha256=XTbfdWKiccEfuqjcCA2Fg1kfl2ngbHGjDhCrbTvevi4,1562
+gibson/command/new/New.py,sha256=o-LMZurujp6cp01xKCdHY02F0hakXG3N7qkxKm-ZN58,1214
+gibson/command/new/Project.py,sha256=sExmNYDKWMIohAoBiF73nkVubgy6iMleaknXW8fWZJA,657
 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
@@ -58,16 +59,16 @@ 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=5XJdm9n5Sa75Hv0BYVaGVhnzsgpwfbB2pGXcbGh5EjU,1539
-gibson/core/CommandRouter.py,sha256=bbdJLJZazQnSZVdi1MDkGrllfMfAz3-dWtdwpscltr8,4123
+gibson/core/CommandRouter.py,sha256=_CN9BVHDbBMy-o0RJ4NjZ8rHbZolqSEKYwWLCNRBMMw,3999
 gibson/core/Completions.py,sha256=Bsh25vnf0pjpJA6MJNR_2MA2s58Ujj8XolR8fm8AQ_s,1197
 gibson/core/Configuration.py,sha256=rJq6XFS-vV8elACYmbFdnzzW4PsQb1BjyWuajfx46KQ,15787
-gibson/core/Conversation.py,sha256=cZTlP_VAv9OfBAxACCmGHuOfobCKKlWMplXrpc4-aGs,8694
+gibson/core/Conversation.py,sha256=FjDeaDy7xZqSlY3Sb1VZlAyRnycjSR_8t9-84TvNcsM,8993
 gibson/core/Env.py,sha256=08dZRHzzR0ahrbM4S0bXC7V1xhYQkT8Zefs00qUHf0U,498
 gibson/core/Memory.py,sha256=Yw6xmqtAsFwd5Q4VgmGDt4U2dUGLyFXZ_nO8c74Oo8E,4005
 gibson/core/PythonPath.py,sha256=p1q7n_5KnPvA8XbxJyvqC2vrIdEdTiMr6vRU9yj77Cs,1567
 gibson/core/TimeKeeper.py,sha256=0mzs04wizjGEJbiQFWZyi4ja4XgeJaDqc0JzPCHp9po,250
 gibson/core/utils.py,sha256=KTnPvA3sUYnLFTZG7Tke5YEdls8Da0rNbeaOm8hapiU,408
-gibson/data/bash-completion.tmpl,sha256=8XYbLMjyKlbaY4RVutxDqcwNLh5HNjTVDmZ3_Eci2xU,2726
+gibson/data/bash-completion.tmpl,sha256=HhLAQryO-EAc5IY6q39bH1QjtE0-BNmbTxZadLnVsZU,2701
 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
@@ -107,8 +108,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.5.0.dist-info/METADATA,sha256=595lPBY_q33rkxwcNPM8--RHfcadaEbSciZjG35QQO4,11569
-gibson_cli-0.5.0.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-gibson_cli-0.5.0.dist-info/entry_points.txt,sha256=j5VUvq3AzL21xPvVC24zMoXFt-I5lUWulr66nL3OAPM,50
-gibson_cli-0.5.0.dist-info/top_level.txt,sha256=RFaUY7VXGiqkMwo1Rj7pM4kGvxkhhnfo-2LmPpuL_fs,11
-gibson_cli-0.5.0.dist-info/RECORD,,
+gibson_cli-0.5.2.dist-info/METADATA,sha256=jMUs0Mfz7ffTyq0b4SQ-AsTqlSvFKCsuzagox03Lzvw,11605
+gibson_cli-0.5.2.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+gibson_cli-0.5.2.dist-info/entry_points.txt,sha256=j5VUvq3AzL21xPvVC24zMoXFt-I5lUWulr66nL3OAPM,50
+gibson_cli-0.5.2.dist-info/top_level.txt,sha256=RFaUY7VXGiqkMwo1Rj7pM4kGvxkhhnfo-2LmPpuL_fs,11
+gibson_cli-0.5.2.dist-info/RECORD,,

gibson/command/Module.py

@@ -1,40 +0,0 @@
-import re
-import sys
-
-from gibson.api.Cli import Cli
-from gibson.command.BaseCommand import BaseCommand
-from gibson.core.Colors import command, hint, input, subcommand
-
-
-class Module(BaseCommand):
-    def execute(self):
-        if len(sys.argv) != 3:
-            self.usage()
-
-        self.configuration.ensure_project()
-        if not re.search("^[a-z0-9]+$", sys.argv[2]):
-            self.configuration.display_project()
-            self.conversation.type("[module name] should only contain ^[a-z0-9]+$.\n\n")
-            return True
-
-        cli = Cli(self.configuration)
-
-        response = cli.modeler_module(
-            self.configuration.project.modeler.version,
-            self.configuration.project.description,
-            sys.argv[2],
-        )
-
-        self.memory.remember_last(response)
-
-        for entity in response["entities"]:
-            print(entity["definition"])
-            self.conversation.newline()
-
-    def usage(self):
-        self.configuration.display_project()
-        self.conversation.type(
-            f"usage: {command(self.configuration.command)} {subcommand('module')} {input('[module name]')} {hint('create a new module for this project')}\n"
-        )
-        self.conversation.newline()
-        exit(1)