fix export import with path, add pyfzf as required

This commit is contained in:
Federico Luzzi 2023-09-13 11:17:56 -03:00
parent 98b85628de
commit 4373a34711
4 changed files with 12 additions and 12 deletions

View File

@ -1,2 +1,2 @@
__version__ = "3.4.0" __version__ = "3.4.1"

View File

@ -107,11 +107,11 @@ class connapp:
bulkparser.set_defaults(func=self._func_others) bulkparser.set_defaults(func=self._func_others)
# EXPORTPARSER # EXPORTPARSER
exportparser = subparsers.add_parser("export", help="Export connection folder to Yaml file") exportparser = subparsers.add_parser("export", help="Export connection folder to Yaml file")
exportparser.add_argument("export", nargs=2, action=self._store_type, help="export [@subfolder]@folder file.yaml", type=self._type_node) exportparser.add_argument("export", nargs=2, action=self._store_type, help="Export [@subfolder]@folder /path/to/file.yml")
exportparser.set_defaults(func=self._func_export) exportparser.set_defaults(func=self._func_export)
# IMPORTPARSER # IMPORTPARSER
importparser = subparsers.add_parser("import", help="Import connection folder to config from Yaml file") importparser = subparsers.add_parser("import", help="Import connection folder to config from Yaml file")
importparser.add_argument("import", nargs=1, action=self._store_type, help="import file.yaml", type=self._type_node) importparser.add_argument("file", nargs=1, action=self._store_type, help="Import /path/to/file.yml")
importparser.set_defaults(func=self._func_import) importparser.set_defaults(func=self._func_import)
# AIPARSER # AIPARSER
aiparser = subparsers.add_parser("ai", help="Make request to an AI") aiparser = subparsers.add_parser("ai", help="Make request to an AI")
@ -569,7 +569,8 @@ class connapp:
if not os.path.exists(args.data[0]): if not os.path.exists(args.data[0]):
print("File {} dosn't exists".format(args.data[0])) print("File {} dosn't exists".format(args.data[0]))
exit(14) exit(14)
question = [inquirer.Confirm("import", message="Are you sure you want to import {} file? This could overwrite your current configuration".format(args.data[0]))] print("This could overwrite your current configuration!")
question = [inquirer.Confirm("import", message="Are you sure you want to import {} file?".format(args.data[0]))]
confirm = inquirer.prompt(question) confirm = inquirer.prompt(question)
if confirm == None: if confirm == None:
exit(7) exit(7)

View File

@ -1894,11 +1894,11 @@ Categorize the user's request based on the operation they want to perform on
bulkparser.set_defaults(func=self._func_others) bulkparser.set_defaults(func=self._func_others)
# EXPORTPARSER # EXPORTPARSER
exportparser = subparsers.add_parser("export", help="Export connection folder to Yaml file") exportparser = subparsers.add_parser("export", help="Export connection folder to Yaml file")
exportparser.add_argument("export", nargs=2, action=self._store_type, help="export [@subfolder]@folder file.yaml", type=self._type_node) exportparser.add_argument("export", nargs=2, action=self._store_type, help="Export [@subfolder]@folder /path/to/file.yml")
exportparser.set_defaults(func=self._func_export) exportparser.set_defaults(func=self._func_export)
# IMPORTPARSER # IMPORTPARSER
importparser = subparsers.add_parser("import", help="Import connection folder to config from Yaml file") importparser = subparsers.add_parser("import", help="Import connection folder to config from Yaml file")
importparser.add_argument("import", nargs=1, action=self._store_type, help="import file.yaml", type=self._type_node) importparser.add_argument("file", nargs=1, action=self._store_type, help="Import /path/to/file.yml")
importparser.set_defaults(func=self._func_import) importparser.set_defaults(func=self._func_import)
# AIPARSER # AIPARSER
aiparser = subparsers.add_parser("ai", help="Make request to an AI") aiparser = subparsers.add_parser("ai", help="Make request to an AI")
@ -2356,7 +2356,8 @@ Categorize the user's request based on the operation they want to perform on
if not os.path.exists(args.data[0]): if not os.path.exists(args.data[0]):
print("File {} dosn't exists".format(args.data[0])) print("File {} dosn't exists".format(args.data[0]))
exit(14) exit(14)
question = [inquirer.Confirm("import", message="Are you sure you want to import {} file? This could overwrite your current configuration".format(args.data[0]))] print("This could overwrite your current configuration!")
question = [inquirer.Confirm("import", message="Are you sure you want to import {} file?".format(args.data[0]))]
confirm = inquirer.prompt(question) confirm = inquirer.prompt(question)
if confirm == None: if confirm == None:
exit(7) exit(7)
@ -3207,11 +3208,11 @@ tasks:
bulkparser.set_defaults(func=self._func_others) bulkparser.set_defaults(func=self._func_others)
# EXPORTPARSER # EXPORTPARSER
exportparser = subparsers.add_parser("export", help="Export connection folder to Yaml file") exportparser = subparsers.add_parser("export", help="Export connection folder to Yaml file")
exportparser.add_argument("export", nargs=2, action=self._store_type, help="export [@subfolder]@folder file.yaml", type=self._type_node) exportparser.add_argument("export", nargs=2, action=self._store_type, help="Export [@subfolder]@folder /path/to/file.yml")
exportparser.set_defaults(func=self._func_export) exportparser.set_defaults(func=self._func_export)
# IMPORTPARSER # IMPORTPARSER
importparser = subparsers.add_parser("import", help="Import connection folder to config from Yaml file") importparser = subparsers.add_parser("import", help="Import connection folder to config from Yaml file")
importparser.add_argument("import", nargs=1, action=self._store_type, help="import file.yaml", type=self._type_node) importparser.add_argument("file", nargs=1, action=self._store_type, help="Import /path/to/file.yml")
importparser.set_defaults(func=self._func_import) importparser.set_defaults(func=self._func_import)
# AIPARSER # AIPARSER
aiparser = subparsers.add_parser("ai", help="Make request to an AI") aiparser = subparsers.add_parser("ai", help="Make request to an AI")

View File

@ -29,14 +29,12 @@ install_requires =
pexpect pexpect
pycryptodome pycryptodome
Flask Flask
pyfzf
waitress waitress
PyYAML PyYAML
openai openai
rich rich
[options.extras_require]
fuzzysearch = pyfzf
[options.entry_points] [options.entry_points]
console_scripts = console_scripts =
conn = connpy.__main__:main conn = connpy.__main__:main