dmddl 0.2.4__tar.gz → 0.2.6__tar.gz

{dmddl-0.2.4 → dmddl-0.2.6}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.3
 Name: dmddl
-Version: 0.2.4
-Summary: cli tool for creating insert export POETRY_PYPI_TOKEN_PYP script from ddl script
+Version: 0.2.6
+Summary: cli tool for creating insert script from ddl script
 License: MIT
 Author: HoJLter
 Author-email: hojlter.work@gmail.com

{dmddl-0.2.4 → dmddl-0.2.6}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "dmddl"
-version = "0.2.4"
-description = "cli tool for creating insert export POETRY_PYPI_TOKEN_PYP script from ddl script"
+version = "0.2.6"
+description = "cli tool for creating insert script from ddl script"
 authors = [
     {name = "HoJLter",email = "hojlter.work@gmail.com"}
 ]

{dmddl-0.2.4 → dmddl-0.2.6}/src/dmddl/cli.py

@@ -6,33 +6,26 @@ from rich.console import Console
 from dmddl.models.llm import openai_request
 from dmddl.models.prompt import prompt as base_prompt
 import argparse
-import sys
 
 
 AVAILABLE_PROVIDERS = ["OpenAI"]
-sys.tracebacklimit = 10 # it makes errors more user-friendly (turn off for dev)
 
 
 def choose_provider(providers):
-    selected = questionary.select("Choose your LLM provider:",
+    provider = questionary.select("Choose your LLM provider:",
                                    choices=providers).ask()
-    return selected
+    if provider:
+        return provider
+    else:
+        raise Exception("LLM Provider isn't found")
 
 
 def ask_api_key():
     api_key = questionary.password("Enter your api key:").ask()
-    return api_key
-
-
-def make_test_query(provider, api_key):
-    console = Console()
-    with console.status("[bold blue]Making test query"):
-        if provider == "OpenAI":
-            try:
-                response = openai_request("Hello! Its a test query :)", api_key)
-                print(f"\n[green bold]{response} \nAll done! Your api key is correct!")
-            except KeyError:
-                print("Your api key is incorrect! Use -c (--config) to set another api key")
+    if api_key:
+        return api_key
+    else:
+        raise Exception("API key isn't provided")
 
 
 def make_query(provider, api_key, prompt):
@@ -41,7 +34,8 @@ def make_query(provider, api_key, prompt):
         if provider == "OpenAI":
             response = openai_request(base_prompt+prompt, api_key)
             return response
-        raise ValueError("LLM Provider not found")
+
+        raise Exception("LLM Provider not found")
 
 
 def write_output_file(data):
@@ -75,25 +69,35 @@ def main():
     llm_provider = settings['DMDDL_CUR_PROVIDER']
     api_key = settings['DMDDL_LLM_KEY']
 
-    if not api_key or args.config:
-        set_parameters()
 
+    if not args.source and not args.config:
+        print("[red bold]You must provide any arguments:\n"
+              "-c (--config): opens settings menu\n"
+              "-s (--source): specify the input file")
+
+
+    if args.config:
+        set_parameters()
     if args.source:
         with open(args.source, "r", encoding='utf-8') as file:
             user_prompt = file.read()
         syntax = Syntax(user_prompt, 'sql', line_numbers=True)
+        print(f"\n[yellow bold]{args.source.upper()}\n", )
         console.print(syntax)
-
-        confirmation = questionary.confirm("Do you wanna use this DDL script?").ask()
+        confirmation = questionary.confirm("Do you want to use this DDL script to generate the insert?").ask()
 
         if confirmation:
-            response = make_query(provider=llm_provider,
-                                  api_key=api_key,
-                                  prompt=user_prompt)
+            success, response = make_query(provider=llm_provider,
+                                           api_key=api_key,
+                                           prompt=user_prompt)
             write_output_file(response)
             syntax = Syntax(response, 'sql', line_numbers=True)
+            print("\n\n[yellow bold]OUTPUT.TXT\n",)
             console.print(syntax)
-            print("[green bold] Your DML script is ready! Check output.txt")
+            if success:
+                print("[green bold] Your DML script is ready! Check output.txt")
+            if not success:
+                print("[red bold] Error has occurred... Check output.txt")
 
 
 if __name__ == '__main__':

{dmddl-0.2.4 → dmddl-0.2.6}/src/dmddl/config/settings.py

@@ -4,7 +4,7 @@ import dotenv
 def get_dotenv_path():
     env_path = dotenv.find_dotenv()
     if not env_path:
-        with open("config/.env", "x"):
+        with open("config/.env", "w"):
             pass
     env_path = dotenv.find_dotenv()
     return env_path

{dmddl-0.2.4 → dmddl-0.2.6}/src/dmddl/models/llm.py

@@ -16,10 +16,12 @@ def openai_request(prompt, api_key):
         ]
     }
     response = requests.post(url=url, headers=headers, json=data)
-    try:
-        return response.json()['choices'][0]['message']['content']
-    except KeyError as e:
-        print(f"[red bold] Error: {e}.\n Check output.txt file.")
-        return response.json()
+    if response.status_code == 200:
+        return True, response.json()['choices'][0]['message']['content']
+    elif response.status_code == 401:
+        return False, ("Your api key is incorrect. \n"
+                       "Use -c (--config) to configurate app and set new API key.")
+    else:
+        return False, response.json()['error']['message']