gibson-cli 0.5.0__tar.gz → 0.5.2__tar.gz

{gibson_cli-0.5.0/gibson_cli.egg-info → gibson_cli-0.5.2}/PKG-INFO

@@ -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 → gibson_cli-0.5.2}/README.md

@@ -152,6 +152,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 → gibson_cli-0.5.2}/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_cli-0.5.0 → gibson_cli-0.5.2}/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_cli-0.5.2/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_cli-0.5.2/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_cli-0.5.0/gibson/command/New.py → gibson_cli-0.5.2/gibson/command/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_cli-0.5.0 → gibson_cli-0.5.2}/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_cli-0.5.0 → gibson_cli-0.5.2}/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_cli-0.5.0 → gibson_cli-0.5.2}/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 → gibson_cli-0.5.2/gibson_cli.egg-info}/PKG-INFO

@@ -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 → gibson_cli-0.5.2}/gibson_cli.egg-info/SOURCES.txt

@@ -21,8 +21,6 @@ gibson/command/List.py
 gibson/command/Merge.py
 gibson/command/Model.py
 gibson/command/Modify.py
-gibson/command/Module.py
-gibson/command/New.py
 gibson/command/OpenApi.py
 gibson/command/Question.py
 gibson/command/Remove.py
@@ -36,6 +34,9 @@ gibson/command/WarGames.py
 gibson/command/auth/Auth.py
 gibson/command/auth/Login.py
 gibson/command/auth/Logout.py
+gibson/command/new/Module.py
+gibson/command/new/New.py
+gibson/command/new/Project.py
 gibson/command/rewrite/Api.py
 gibson/command/rewrite/Base.py
 gibson/command/rewrite/Models.py

{gibson_cli-0.5.0 → gibson_cli-0.5.2}/pyproject.toml

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

gibson_cli-0.5.0/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)