dmddl 0.2.16__tar.gz → 0.2.18__tar.gz

{dmddl-0.2.16 → dmddl-0.2.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dmddl
-Version: 0.2.16
+Version: 0.2.18
 Summary: cli tool for creating insert script from ddl script
 License: MIT
 Author: HoJLter
@@ -9,8 +9,12 @@ Requires-Python: >=3.13
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: pydantic (>=2.11.4,<3.0.0)
-Requires-Dist: pydantic-settings (>=2.9.1,<3.0.0)
+Requires-Dist: aiohttp (>=3.11.18,<4.0.0)
+Requires-Dist: bs4 (>=0.0.2,<0.0.3)
+Requires-Dist: dotenv (>=0.9.9,<0.10.0)
+Requires-Dist: questionary (>=2.1.0,<3.0.0)
+Requires-Dist: requests (>=2.32.3,<3.0.0)
+Requires-Dist: rich (>=14.0.0,<15.0.0)
 Description-Content-Type: text/markdown
 
 

{dmddl-0.2.16 → dmddl-0.2.18}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dmddl"
-version = "0.2.16"
+version = "0.2.18"
 description = "cli tool for creating insert script from ddl script"
 authors = [
     {name = "HoJLter",email = "hojlter.work@gmail.com"}
@@ -9,8 +9,12 @@ license = {text = "MIT License"}
 readme = "README.md"
 requires-python = ">=3.13"
 dependencies = [
-    "pydantic (>=2.11.4,<3.0.0)",
-    "pydantic-settings (>=2.9.1,<3.0.0)"
+    "aiohttp (>=3.11.18,<4.0.0)",
+    "bs4 (>=0.0.2,<0.0.3)",
+    "rich (>=14.0.0,<15.0.0)",
+    "questionary (>=2.1.0,<3.0.0)",
+    "requests (>=2.32.3,<3.0.0)",
+    "dotenv (>=0.9.9,<0.10.0)"
 ]
 
 

dmddl-0.2.18/src/dmddl/.ruff_cache/.gitignore

@@ -0,0 +1,2 @@
+# Automatically created by ruff.
+*

dmddl-0.2.18/src/dmddl/.ruff_cache/CACHEDIR.TAG

@@ -0,0 +1 @@
+Signature: 8a477f597d28d172789f06886806bc55

dmddl-0.2.18/src/dmddl/cli.py

@@ -0,0 +1,145 @@
+import asyncio
+
+import questionary
+from dmddl.config.settings import LLMSettings
+from rich import print
+from rich.syntax import Syntax
+from rich.console import Console
+from dmddl.models.llm import openai_request
+from dmddl.models.prompt import prompt as base_prompt
+import argparse
+from dmddl.config.proxy import get_valid_proxies
+
+AVAILABLE_PROVIDERS = ["OpenAI"]
+
+
+def choose_provider(providers):
+    provider = questionary.select("Choose your LLM provider:",
+                                   choices=providers).ask()
+    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()
+    if api_key:
+        return api_key
+    else:
+        raise Exception("API key isn't provided")
+
+
+def make_query(provider, api_key, prompt, proxies = None):
+    console = Console()
+    with console.status("[bold blue]Making query. Wait for result..."):
+        if provider:
+            if provider == "OpenAI":
+                response = openai_request(prompt=base_prompt+prompt, api_key=api_key, proxies=proxies)
+                return response
+
+            raise Exception("LLM Provider not found")
+        else:
+            raise Exception("Use -c (--config) to configurate app and set LLM provider.")
+
+
+def write_output_file(data):
+    with open("output.txt", 'w') as file:
+        file.write(data)
+
+
+def set_parameters():
+    settings = LLMSettings()
+
+    llm_provider = choose_provider(AVAILABLE_PROVIDERS)
+    api_key = ask_api_key()
+
+    settings['DMDDL_CUR_PROVIDER'] = llm_provider
+    settings['DMDDL_LLM_KEY'] = api_key
+
+
+def get_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-c", "--config", action="store_true")
+    parser.add_argument("-s", "--source")
+    parser.add_argument("-p", "--proxy", action="store_true")
+
+    return parser.parse_args()
+
+
+def input_prompt_dialogue(args):
+    console = Console()
+
+    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 want to use this DDL script to generate the insert?").ask()
+
+    return confirmation, user_prompt
+
+
+def query_dialog(llm_provider, api_key, user_prompt, proxies=None):
+    console = Console()
+
+    success, response = make_query(provider=llm_provider,
+                                   api_key=api_key,
+                                   prompt=user_prompt,
+                                   proxies=proxies)
+
+    write_output_file(response)
+
+    print("\n[yellow bold]OUTPUT.TXT\n", )
+    if success:
+        syntax = Syntax(response, 'sql', line_numbers=True)
+        console.print(syntax)
+        print("[green bold] Your DML script is ready! Check output.txt")
+
+    else:
+        syntax = Syntax(response, 'bash', line_numbers=True)
+        console.print(syntax)
+        print("[red bold] Error has occurred... Check output.txt")
+
+
+def main():
+    settings = LLMSettings()
+    args = get_args()
+    console = Console()
+
+    llm_provider = settings['DMDDL_CUR_PROVIDER']
+    api_key = settings['DMDDL_LLM_KEY']
+
+
+    if not args.source and not args.config and not args.proxy:
+        print("[red bold]You must provide any arguments:\n"
+              "-c (--config): opens settings menu\n"
+              "-s (--source): specify the input file"
+              "-sp (--proxy): specify the input file (request with proxy)")
+
+    if args.config:
+        set_parameters()
+
+
+    if args.source:
+        proxies = None
+
+        if args.proxy:
+            with console.status("[blue bold] Finding valid proxies..."):
+                proxies = asyncio.run(get_valid_proxies())
+                if proxies:
+                    print("[bold blue] Proxy found!")
+                    for proxy in proxies:
+                        print(f"[yellow bold]- {proxy}")
+                else:
+                    print("[yellow bold] Proxy does not found :( \n Try again later. (it really helps)")
+
+        confirmation, user_prompt = input_prompt_dialogue(args)
+
+        if confirmation:
+            query_dialog(llm_provider, api_key, user_prompt, proxies)
+
+
+if __name__ == '__main__':
+    main()

dmddl-0.2.18/src/dmddl/config/.env

@@ -0,0 +1,2 @@
+DMDDL_CUR_PROVIDER='OpenAI'
+DMDDL_LLM_KEY='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'

dmddl-0.2.18/src/dmddl/config/proxy.py

@@ -0,0 +1,35 @@
+import asyncio
+from bs4 import BeautifulSoup
+import aiohttp
+import requests
+
+
+def get_proxy_list():
+    url = "https://free-proxy-list.net/"
+    response = requests.get(url)
+    soup = BeautifulSoup(response.text, 'html.parser')
+    proxies = []
+    table = soup.find('table')
+    for row in table.tbody.find_all('tr'):
+        cols = row.find_all('td')
+        if cols[4].text == 'elite proxy' and cols[6].text == 'yes':
+            proxies.append(f"http://{cols[0].text}:{cols[1].text}")
+
+    return proxies
+
+
+async def test_request(url, proxy, session):
+    try:
+        async with session.get(url, proxy=proxy, timeout=5) as response:
+            return proxy
+    except:
+        pass
+
+
+async def get_valid_proxies():
+    proxies = get_proxy_list()
+    url = "https://platform.openai.com"
+    async with aiohttp.ClientSession() as session:
+        tasks = [test_request(url, proxy, session) for proxy in proxies]
+        good_proxies = [proxy for proxy in await asyncio.gather(*tasks) if proxy]
+        return good_proxies

{dmddl-0.2.16 → dmddl-0.2.18}/src/dmddl/config/settings.py

@@ -3,10 +3,8 @@ import os
 from pathlib import Path
 
 def get_dotenv_path():
-    # Проверяем стандартные места поиска .env
     env_path = dotenv.find_dotenv()
 
-
     if not env_path:
         env_dir = "config"
         env_path = os.path.join(env_dir, ".env")

dmddl-0.2.18/src/dmddl/input.txt

@@ -0,0 +1 @@
+test

{dmddl-0.2.16 → dmddl-0.2.18}/src/dmddl/models/llm.py

@@ -1,6 +1,7 @@
 import requests
+from rich import print
 
-def openai_request(prompt, api_key):
+def openai_request(prompt, api_key, proxies = None):
     headers = {
         "Authorization": f"Bearer {api_key}",
         "Content-Type": "application/json"
@@ -15,12 +16,28 @@ def openai_request(prompt, api_key):
              }
         ]
     }
-    response = requests.post(url=url, headers=headers, json=data)
+
+    if proxies:
+        for proxy in proxies:
+            print(f"[yellow bold]\nUsing proxy: {proxy}")
+            req_proxies = {
+                "https": proxy
+            }
+            response = requests.post(url=url, headers=headers, json=data, proxies = req_proxies)
+            if response.status_code == 200:
+                break
+
+    else:
+        response = requests.post(url=url, headers=headers, json=data)
+
+
     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']
 

dmddl-0.2.18/src/dmddl/output.txt

@@ -0,0 +1,62 @@
+-- TABLE: users (15 records)
+INSERT INTO users (user_id, username, email) VALUES 
+(1, 'alice_jones', 'alice.jones@example.com'),
+(2, 'bob_brown', 'bob.brown@example.com'),
+(3, 'charlie_lee', 'charlie.lee@test.com'),
+(4, 'david_clark', 'david.clark@example.com'),
+(5, 'emily_williams', 'emily.williams@test.com'),
+(6, 'frank_miller', 'frank.miller@example.com'),
+(7, 'grace_king', 'grace.king@test.com'),
+(8, 'hannah_white', 'hannah.white@example.com'),
+(9, 'ian_green', 'ian.green@example.com'),
+(10, 'jake_harris', 'jake.harris@test.com'),
+(11, 'kate_scott', 'kate.scott@example.com'),
+(12, 'luke_adams', 'luke.adams@test.com'),
+(13, 'mike_james', 'mike.james@example.com'),
+(14, 'nora_moore', 'nora.moore@test.com'),
+(15, 'olivia_taylor', 'olivia.taylor@example.com');
+
+-- TABLE: orders (40 records)
+INSERT INTO orders (order_id, user_id, order_date) VALUES 
+(1, 1, '2023-01-01'),
+(2, 1, '2023-01-05'),
+(3, 2, '2023-01-02'),
+(4, 3, '2023-01-01'),
+(5, 3, '2023-01-03'),
+(6, 4, '2023-01-04'),
+(7, 4, '2023-01-07'),
+(8, 5, '2023-01-02'),
+(9, 5, '2023-01-06'),
+(10, 6, '2023-01-05'),
+(11, 6, '2023-01-08'),
+(12, 7, '2023-01-01'),
+(13, 8, '2023-01-03'),
+(14, 8, '2023-01-09'),
+(15, 9, '2023-01-01'),
+(16, 10, '2023-01-02'),
+(17, 10, '2023-01-06'),
+(18, 11, '2023-01-04'),
+(19, 11, '2023-01-10'),
+(20, 12, '2023-01-01'),
+(21, 12, '2023-01-03'),
+(22, 13, '2023-01-02'),
+(23, 13, '2023-01-05'),
+(24, 14, '2023-01-04'),
+(25, 14, '2023-01-08'),
+(26, 15, '2023-01-02'),
+(27, 15, '2023-01-09'),
+(28, 1, '2023-01-06'),
+(29, 2, '2023-01-03'),
+(30, 3, '2023-01-07'),
+(31, 4, '2023-01-08'),
+(32, 5, '2023-01-01'),
+(33, 6, '2023-01-05'),
+(34, 7, '2023-01-02'),
+(35, 8, '2023-01-10'),
+(36, 9, '2023-01-06'),
+(37, 10, '2023-01-04'),
+(38, 11, '2023-01-03'),
+(39, 12, '2023-01-07'),
+(40, 13, '2023-01-09');
+
+-- WARNING: Consider implementing ON DELETE CASCADE for foreign keys to maintain data integrity.

dmddl-0.2.16/src/dmddl/cli.py

@@ -1,109 +0,0 @@
-import questionary
-from dmddl.config.settings import LLMSettings
-from rich import print
-from rich.syntax import Syntax
-from rich.console import Console
-from dmddl.models.llm import openai_request
-from dmddl.models.prompt import prompt as base_prompt
-import argparse
-
-
-AVAILABLE_PROVIDERS = ["OpenAI"]
-
-
-def choose_provider(providers):
-    provider = questionary.select("Choose your LLM provider:",
-                                   choices=providers).ask()
-    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()
-    if api_key:
-        return api_key
-    else:
-        raise Exception("API key isn't provided")
-
-
-def make_query(provider, api_key, prompt):
-    console = Console()
-    with console.status("[bold blue]Making query. Wait for result..."):
-        if provider:
-            if provider == "OpenAI":
-                response = openai_request(base_prompt+prompt, api_key)
-                return response
-
-            raise Exception("LLM Provider not found")
-        else:
-            raise Exception("Use -c (--config) to configurate app and set LLM provider.")
-
-
-def write_output_file(data):
-    with open("output.txt", 'w') as file:
-        file.write(data)
-
-
-def set_parameters():
-    settings = LLMSettings()
-
-    llm_provider = choose_provider(AVAILABLE_PROVIDERS)
-    api_key = ask_api_key()
-
-    settings['DMDDL_CUR_PROVIDER'] = llm_provider
-    settings['DMDDL_LLM_KEY'] = api_key
-
-
-def get_args():
-    parser = argparse.ArgumentParser()
-    parser.add_argument("-c", "--config", action="store_true")
-    parser.add_argument("-s", "--source")
-
-    return parser.parse_args()
-
-
-def main():
-    settings = LLMSettings()
-    args = get_args()
-    console = Console()
-
-    llm_provider = settings['DMDDL_CUR_PROVIDER']
-    api_key = settings['DMDDL_LLM_KEY']
-
-
-    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 want to use this DDL script to generate the insert?").ask()
-
-        if confirmation:
-            success, response = make_query(provider=llm_provider,
-                                           api_key=api_key,
-                                           prompt=user_prompt)
-            write_output_file(response)
-            print("\n\n[yellow bold]OUTPUT.TXT\n",)
-            if success:
-                syntax = Syntax(response, 'sql', line_numbers=True)
-                console.print(syntax)
-                print("[green bold] Your DML script is ready! Check output.txt")
-            if not success:
-                syntax = Syntax(response, 'bash', line_numbers=True)
-                console.print(syntax)
-                print("[red bold] Error has occurred... Check output.txt")
-
-
-if __name__ == '__main__':
-    main()