PyPI - commit-maker - Versions diffs - 0.1.2__tar.gz → 0.2.1__tar.gz - Mend

commit-maker 0.1.2tar.gz → 0.2.1tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

{commit_maker-0.1.2/src/commit_maker.egg-info → commit_maker-0.2.1}/PKG-INFO RENAMED Viewed

@@ -1,18 +1,17 @@
-Metadata-Version: 2.4
-Name: commit_maker
-Version: 0.1.2
+Metadata-Version: 2.1
+Name: commit-maker
+Version: 0.2.1
 Summary: CLI-утилита для генерации git-коммитов с помощью ИИ
+Home-page: https://github.com/Sashayerty/commit_maker
 Author: Alex Bulgakov
 Author-email: Alex Bulgakov <sashayerty@ya.ru>
 License: MIT
+Project-URL: Homepage, https://github.com/sashayerty/commit_maker
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Dynamic: author
-Dynamic: license-file
-Dynamic: requires-python
-# Commit Maker [![Created with Python](https://img.shields.io/badge/Created_with-Python-blue)](https://www.python.org/) [![Created with uv](https://img.shields.io/badge/Created_with-uv-purple)](https://docs.astral.sh/uv/) [![Created with ollama](https://img.shields.io/badge/Created_with-ollama-white)](https://ollama.com/)
+# Commit Maker [![Created with Python](https://img.shields.io/badge/Created_with-Python-blue)](https://www.python.org/) [![Created with uv](https://img.shields.io/badge/Created_with-uv-purple)](https://docs.astral.sh/uv/) [![Created with ollama](https://img.shields.io/badge/Created_with-ollama-white)](https://ollama.com/) [![PyPi](https://img.shields.io/badge/Available_on-pypi-orange)](https://pypi.org/project/commit-maker/)
 ![Демонстрация](./commit_maker.svg)
@@ -92,21 +91,13 @@ pip3 install commit_maker
 ## Использование
-### Windows
-   ```cmd
-   commit_maker [OPTION] [VALUE]
-   ```
-### Linux/MacOS
    ```bash
    commit_maker [OPTION] [VALUE]
    ```
 ### Пример использования
-**`-h`**, **`--help`** - вывод помощи
+**`-h`**, **`--help`** - вывод помощи
 **`-l`**, **`--local-models`** - использование локальных моделей
 **`-m`**, **`--max-symbols`** - ограничение длины сообщения коммита
 **`-M`**, **`--model`** - какую локальную модель использовать (при **`-l`**)

{commit_maker-0.1.2 → commit_maker-0.2.1}/README.md RENAMED Viewed

@@ -1,4 +1,4 @@
-# Commit Maker [![Created with Python](https://img.shields.io/badge/Created_with-Python-blue)](https://www.python.org/) [![Created with uv](https://img.shields.io/badge/Created_with-uv-purple)](https://docs.astral.sh/uv/) [![Created with ollama](https://img.shields.io/badge/Created_with-ollama-white)](https://ollama.com/)
+# Commit Maker [![Created with Python](https://img.shields.io/badge/Created_with-Python-blue)](https://www.python.org/) [![Created with uv](https://img.shields.io/badge/Created_with-uv-purple)](https://docs.astral.sh/uv/) [![Created with ollama](https://img.shields.io/badge/Created_with-ollama-white)](https://ollama.com/) [![PyPi](https://img.shields.io/badge/Available_on-pypi-orange)](https://pypi.org/project/commit-maker/)
 ![Демонстрация](./commit_maker.svg)
@@ -78,21 +78,13 @@ pip3 install commit_maker
 ## Использование
-### Windows
-   ```cmd
-   commit_maker [OPTION] [VALUE]
-   ```
-### Linux/MacOS
    ```bash
    commit_maker [OPTION] [VALUE]
    ```
 ### Пример использования
-**`-h`**, **`--help`** - вывод помощи
+**`-h`**, **`--help`** - вывод помощи
 **`-l`**, **`--local-models`** - использование локальных моделей
 **`-m`**, **`--max-symbols`** - ограничение длины сообщения коммита
 **`-M`**, **`--model`** - какую локальную модель использовать (при **`-l`**)

{commit_maker-0.1.2 → commit_maker-0.2.1}/pyproject.toml RENAMED Viewed

@@ -1,6 +1,6 @@
 [project]
-name = "commit_maker"
-version = "0.1.2"
+name = "commit-maker"
+version = "0.2.1"
 authors = [
   { name="Alex Bulgakov", email="sashayerty@ya.ru" }
 ]
@@ -11,4 +11,7 @@ requires-python = ">=3.8"
 dependencies = []
 [project.scripts]
-commit_maker = "commit_maker.main:main"
+commit_maker = "commit_maker.main:main"
+[project.urls]
+Homepage = "https://github.com/sashayerty/commit_maker"

{commit_maker-0.1.2 → commit_maker-0.2.1}/setup.py RENAMED Viewed

@@ -1,8 +1,8 @@
 from setuptools import find_packages, setup
 setup(
-    name="commit_maker",
-    version="0.1.2",
+    name="commit-maker",
+    version="0.2.1",
     author="Alex Bulgakov",
     author_email="sashayerty@ya.ru",
     description="CLI-утилита для генерации git-коммитов с помощью ИИ",
@@ -24,4 +24,5 @@ setup(
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
     ],
+    url="https://github.com/Sashayerty/commit_maker",
 )

{commit_maker-0.1.2 → commit_maker-0.2.1}/src/commit_maker/main.py RENAMED Viewed

@@ -9,25 +9,7 @@ import urllib
 import urllib.request
 # Константы
-mistral_api_key = os.environ["MISTRAL_API_KEY"]
-# Для цветных логов
-COLOR_RED = "\033[31m"
-COLOR_GREEN = "\033[32m"
-COLOR_YELLOW = "\033[33m"
-COLOR_BLUE = "\033[94m"
-COLOR_MAGENTA = "\033[95m"
-COLOR_CYAN = "\033[96m"
-COLOR_RESET = "\033[0m"
-COLORS_DICT = {
-    "red": COLOR_RED,
-    "green": COLOR_GREEN,
-    "yellow": COLOR_YELLOW,
-    "blue": COLOR_BLUE,
-    "magenta": COLOR_MAGENTA,
-    "cyan": COLOR_CYAN,
-    "reset": COLOR_RESET,
-}
+mistral_api_key = os.environ.get("MISTRAL_API_KEY")
 # Парсер параметров
 parser = argparse.ArgumentParser(
@@ -48,9 +30,9 @@ parser.add_argument(
     "-m",
     "--max-symbols",
     type=int,
-    default=250,
+    default=200,
     metavar="[max_symbols]",
-    help="Длина сообщения коммита. Defaults to 150",
+    help="Длина сообщения коммита. Defaults to 200",
 )
 parser.add_argument(
     "-M",
@@ -67,22 +49,15 @@ parser.add_argument(
     help="Запуск с выводом сообщения на основе зайстейдженных "
     "изменений, без создания коммита",
 )
-# Парсинг аргументов
-parsed_args = parser.parse_args()
-use_local_models = parsed_args.local_models
-max_symbols = parsed_args.max_symbols
-model = parsed_args.model
-dry_run = parsed_args.dry_run
-# Промпт для ИИ
-prompt_for_ai = f"""Привет! Ты составитель коммитов для git.
-Сгенерируй коммит-месседж на РУССКОМ языке, который:
-1. Точно отражает суть изменений
-2. Не превышает {max_symbols} символов
-Опирайся на данные от 'git status' и 'git diff'.
-В ответ на это сообщение тебе нужно предоставить
-ТОЛЬКО коммит. Пиши просто обычный текст, без markdown!"""
+parser.add_argument(
+    "-t",
+    "--temperature",
+    default=1.0,
+    type=float,
+    help="Температура модели при создании месседжа.\
+        Находится на отрезке [0.0, 1.5]. Defaults to 1.0",
+    metavar="[temperature]",
+)
 # Класс для использования API Mistral AI
@@ -252,7 +227,22 @@ def colored(
         `print(colored(string='Success!', color='green'))` # Выводит 'Success!'
         зеленого цвета
     """
-    global COLORS_DICT
+    COLOR_RED = "\033[31m"
+    COLOR_GREEN = "\033[32m"
+    COLOR_YELLOW = "\033[33m"
+    COLOR_BLUE = "\033[94m"
+    COLOR_MAGENTA = "\033[95m"
+    COLOR_CYAN = "\033[96m"
+    COLOR_RESET = "\033[0m"
+    COLORS_DICT = {
+        "red": COLOR_RED,
+        "green": COLOR_GREEN,
+        "yellow": COLOR_YELLOW,
+        "blue": COLOR_BLUE,
+        "magenta": COLOR_MAGENTA,
+        "cyan": COLOR_CYAN,
+        "reset": COLOR_RESET,
+    }
     return (
         bold(f"{COLORS_DICT[color]}{string}{COLORS_DICT['reset']}")
         if text_bold
@@ -264,8 +254,30 @@ def colored(
 def main() -> None:
-    global mistral_api_key, prompt_for_ai, use_local_models, model, dry_run
+    # Парсинг аргументов
+    parsed_args = parser.parse_args()
+    use_local_models = parsed_args.local_models
+    max_symbols = parsed_args.max_symbols
+    model = parsed_args.model
+    dry_run = parsed_args.dry_run
+    temperature = parsed_args.temperature
+    # Промпт для ИИ
+    prompt_for_ai = f"""Привет! Ты составитель коммитов для git.
+    Сгенерируй коммит-месседж на РУССКОМ языке, который:
+    1. Точно отражает суть изменений
+    2. Не превышает {max_symbols} символов
+    Опирайся на данные от 'git status' и 'git diff'.
+    В ответ на это сообщение тебе нужно предоставить
+    ТОЛЬКО коммит. Пиши просто обычный текст, без markdown!"""
     try:
+        if not use_local_models and not mistral_api_key:
+            print(
+                colored("Не найден MISTRAL_API_KEY для работы с API!", "red")
+            )
+            return
         # Получаем версию git, если он есть
         git_version = subprocess.run(  # noqa
             ["git", "--version"],
@@ -274,20 +286,23 @@ def main() -> None:
             encoding="utf-8",
         ).stdout
-        # Получаем список моделей из Ollama, если Ollama есть
-        ollama_list_of_models = (
-            subprocess.run(
-                ["ollama", "ls"],
-                capture_output=True,
-                text=True,
-                encoding="utf-8",
+        if use_local_models:
+            # Получаем список моделей из Ollama, если Ollama есть
+            ollama_list_of_models = (
+                subprocess.run(
+                    ["ollama", "ls"],
+                    capture_output=True,
+                    text=True,
+                    encoding="utf-8",
+                )
+                .stdout.strip()
+                .split("\n")
             )
-            .stdout.strip()
-            .split("\n")
-        )
-        ollama_list_of_models = [
-            i.split()[0] for i in ollama_list_of_models[1:]
-        ]
+            ollama_list_of_models = [
+                i.split()[0] for i in ollama_list_of_models[1:]
+            ]
+        else:
+            ollama_list_of_models = 0
         # Обработка отсутствия ollama
         if not ollama_list_of_models and use_local_models:
@@ -409,8 +424,6 @@ def main() -> None:
                     ):
                         subprocess.run(
                             ["git", "add", "-A"],
-                            capture_output=True,
-                            encoding="utf-8",
                         )
                     else:
                         print(
@@ -464,7 +477,7 @@ def main() -> None:
                         + git_status.stdout
                         + "Git diff: "
                         + git_diff.stdout,
-                        temperature=1.0,
+                        temperature=temperature,
                     )
                     commit_with_message_from_ai = input(
                         "Закоммитить с сообщением "
@@ -487,7 +500,7 @@ def main() -> None:
                     + git_status.stdout
                     + "Git diff: "
                     + git_diff.stdout,
-                    temperature=1.0,
+                    temperature=temperature,
                 )
                 print(
                     colored(
@@ -527,8 +540,6 @@ def main() -> None:
                     (
                         subprocess.run(
                             ["git", "add", "-A"],
-                            capture_output=True,
-                            encoding="utf-8",
                         ),
                         subprocess.run(
                             [
@@ -548,6 +559,12 @@ def main() -> None:
                     == "y"
                     else None
                 )
+    except FileNotFoundError as e:
+        print(
+            colored("Ollama не установлена!", "red")
+            if "ollama" in str(e)
+            else colored(str(e), "red")
+        )
     except Exception as e:
         print(colored("Ошибка:", "red") + " " + str(e))

{commit_maker-0.1.2 → commit_maker-0.2.1/src/commit_maker.egg-info}/PKG-INFO RENAMED Viewed

@@ -1,18 +1,17 @@
-Metadata-Version: 2.4
-Name: commit_maker
-Version: 0.1.2
+Metadata-Version: 2.1
+Name: commit-maker
+Version: 0.2.1
 Summary: CLI-утилита для генерации git-коммитов с помощью ИИ
+Home-page: https://github.com/Sashayerty/commit_maker
 Author: Alex Bulgakov
 Author-email: Alex Bulgakov <sashayerty@ya.ru>
 License: MIT
+Project-URL: Homepage, https://github.com/sashayerty/commit_maker
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Dynamic: author
-Dynamic: license-file
-Dynamic: requires-python
-# Commit Maker [![Created with Python](https://img.shields.io/badge/Created_with-Python-blue)](https://www.python.org/) [![Created with uv](https://img.shields.io/badge/Created_with-uv-purple)](https://docs.astral.sh/uv/) [![Created with ollama](https://img.shields.io/badge/Created_with-ollama-white)](https://ollama.com/)
+# Commit Maker [![Created with Python](https://img.shields.io/badge/Created_with-Python-blue)](https://www.python.org/) [![Created with uv](https://img.shields.io/badge/Created_with-uv-purple)](https://docs.astral.sh/uv/) [![Created with ollama](https://img.shields.io/badge/Created_with-ollama-white)](https://ollama.com/) [![PyPi](https://img.shields.io/badge/Available_on-pypi-orange)](https://pypi.org/project/commit-maker/)
 ![Демонстрация](./commit_maker.svg)
@@ -92,21 +91,13 @@ pip3 install commit_maker
 ## Использование
-### Windows
-   ```cmd
-   commit_maker [OPTION] [VALUE]
-   ```
-### Linux/MacOS
    ```bash
    commit_maker [OPTION] [VALUE]
    ```
 ### Пример использования
-**`-h`**, **`--help`** - вывод помощи
+**`-h`**, **`--help`** - вывод помощи
 **`-l`**, **`--local-models`** - использование локальных моделей
 **`-m`**, **`--max-symbols`** - ограничение длины сообщения коммита
 **`-M`**, **`--model`** - какую локальную модель использовать (при **`-l`**)

{commit_maker-0.1.2 → commit_maker-0.2.1}/LICENSE RENAMED Viewed

File without changes

{commit_maker-0.1.2 → commit_maker-0.2.1}/setup.cfg RENAMED Viewed

File without changes

{commit_maker-0.1.2 → commit_maker-0.2.1}/src/commit_maker/__init__.py RENAMED Viewed

File without changes

{commit_maker-0.1.2 → commit_maker-0.2.1}/src/commit_maker.egg-info/SOURCES.txt RENAMED Viewed

File without changes

{commit_maker-0.1.2 → commit_maker-0.2.1}/src/commit_maker.egg-info/dependency_links.txt RENAMED Viewed

File without changes

{commit_maker-0.1.2 → commit_maker-0.2.1}/src/commit_maker.egg-info/entry_points.txt RENAMED Viewed

File without changes

{commit_maker-0.1.2 → commit_maker-0.2.1}/src/commit_maker.egg-info/top_level.txt RENAMED Viewed

File without changes

commit-maker 0.1.2__tar.gz → 0.2.1__tar.gz

commit-maker 0.1.2tar.gz → 0.2.1tar.gz