Merge branch 'main' of github.com:jina-ai/microchain into feat-gpt-turbo

 Conflicts:

	src/apis/gpt.py

	src/cli.py

	src/options/generate/generator.py

	src/options/generate/prompt_tasks.py

src/cli.py

@@ -1,32 +1,84 @@
+import functools
+import os
+
 import click
 
-from src.executor_factory import ExecutorFactory
-from src.jina_cloud import jina_auth_login
-from src.key_handling import set_api_key
+from src.apis.jina_cloud import jina_auth_login
+from src.options.configure.key_handling import set_api_key
+
+
+def exception_interceptor(func):
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        try:
+            return func(*args, **kwargs)
+        except Exception as e:
+            raise type(e)(f'''
+{str(e)}
+
+😱😱😱 Sorry for this experience. 
+Could you please report an issue about this on our github repo? We'll try to fix it asap.
+https://github.com/jina-ai/gptdeploy/issues/new
+''') from e
+    return wrapper
+
+def path_param(func):
+    @click.option('--path', required=True, help='Path to the generated microservice.')
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        path = os.path.expanduser(kwargs['path'])
+        path = os.path.abspath(path)
+        kwargs['path'] = path
+        return func(*args, **kwargs)
+    return wrapper
 
 
 @click.group(invoke_without_command=True)
-def main():
-    jina_auth_login()
+@click.pass_context
+@exception_interceptor
+def main(ctx):
+    if ctx.invoked_subcommand is None:
+        click.echo(ctx.get_help())
 
 
 @main.command()
-@click.option('--description', required=True, help='Description of the executor.')
-@click.option('--test', required=True, help='Test scenario for the executor.')
-@click.option('--num_approaches', default=3, type=int,
-              help='Number of num_approaches to use to fulfill the task (default: 3).')
-@click.option('--output_path', default='executor', help='Path to the output folder (must be empty). ')
+@click.option('--description', required=True, help='Description of the microservice.')
+@click.option('--test', required=True, help='Test scenario for the microservice.')
+@path_param
 @click.option('--model', default='gpt-4', help='GPT model to use (default: gpt-4).')
-def create(
+def generate(
         description,
         test,
-        num_approaches=3,
-        output_path='executor',
+        path,
         model='gpt-4'
 ):
-    executor_factory = ExecutorFactory(model=model)
-    executor_factory.create(description, num_approaches, output_path, test)
+    from src.options.generate.generator import Generator
+    path = os.path.expanduser(path)
+    path = os.path.abspath(path)
+    if os.path.exists(path):
+        if os.listdir(path):
+            click.echo(f"Error: The path {path} you provided via --path is not empty. Please choose a directory that does not exist or is empty.")
+            return
+    generator = Generator(model=model)
+    generator.generate(description, test, path)
 
+@main.command()
+@path_param
+def run(path):
+    from src.options.run import Runner
+    path = os.path.expanduser(path)
+    path = os.path.abspath(path)
+    Runner().run(path)
+
+
+@main.command()
+@path_param
+def deploy(path):
+    jina_auth_login()
+    from src.options.deploy.deployer import Deployer
+    path = os.path.expanduser(path)
+    path = os.path.abspath(path)
+    Deployer().deploy(path)
 
 @main.command()
 @click.option('--key', required=True, help='Your OpenAI API key.')