osa_tool 0.2.3__tar.gz → 0.2.4.0__tar.gz

{osa_tool-0.2.3 → osa_tool-0.2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osa_tool
-Version: 0.2.3
+Version: 0.2.4.0
 Summary: Tool that just makes your open source project better!
 License-Expression: BSD-3-Clause
 License-File: LICENSE
@@ -13,73 +13,31 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Requires-Dist: ProtoLLM (>=0.1.5)
-Requires-Dist: PyYAML (==6.0.2)
-Requires-Dist: Pygments (==2.19.1)
-Requires-Dist: aiofiles (>=24.1.0,<25.0.0)
-Requires-Dist: aiohappyeyeballs (==2.4.4)
-Requires-Dist: aiohttp (==3.11.11)
-Requires-Dist: aiosignal (==1.3.2)
-Requires-Dist: annotated-types (==0.7.0)
-Requires-Dist: anyio (==4.7.0)
-Requires-Dist: async-timeout (>=4.0.0,<5.0.0)
-Requires-Dist: attrs (==25.1.0)
-Requires-Dist: black (==25.1.0)
-Requires-Dist: certifi (==2024.12.14)
-Requires-Dist: charset-normalizer (==3.4.1)
-Requires-Dist: colorama (==0.4.6)
-Requires-Dist: distro (==1.9.0)
-Requires-Dist: exceptiongroup (==1.2.2)
-Requires-Dist: frozenlist (==1.5.0)
-Requires-Dist: gitdb (==4.0.11)
-Requires-Dist: gitpython (==3.1.43)
-Requires-Dist: h11 (==0.16.0)
-Requires-Dist: httpcore (==1.0.9)
-Requires-Dist: httpx (>=0.27.2,<0.28.0)
-Requires-Dist: idna (==3.10)
-Requires-Dist: iniconfig (==2.0.0)
-Requires-Dist: jiter (==0.8.2)
-Requires-Dist: markdown-it-py (==3.0.0)
-Requires-Dist: mdurl (==0.1.2)
-Requires-Dist: mkdocs (==1.6.1)
-Requires-Dist: mkdocs-material (==9.6.13)
-Requires-Dist: mkdocstrings[python] (==0.29.1)
-Requires-Dist: multidict (==6.1.0)
+Requires-Dist: GitPython (>=3.1.40)
+Requires-Dist: Pygments (>=2.18.0)
+Requires-Dist: aiofiles (>=24.1.0)
+Requires-Dist: black (>=25.0.0)
+Requires-Dist: colorama (>=0.4.6)
+Requires-Dist: docx2txt (>=0.9)
+Requires-Dist: mkdocs (>=1.6.0)
+Requires-Dist: mkdocs-material (>=9.6.0)
+Requires-Dist: mkdocstrings-python (>=1.16.0)
+Requires-Dist: mkdocstrings[python] (>=0.29.0)
 Requires-Dist: nbconvert (>=6.0)
 Requires-Dist: nbformat (>=5.0)
-Requires-Dist: openai (==1.58.1)
-Requires-Dist: openpyxl (==3.1.5)
-Requires-Dist: packaging (==24.2)
-Requires-Dist: pandas (==2.2.3)
-Requires-Dist: pdfminer.six (==20231228)
-Requires-Dist: pdfplumber (==0.11.5)
-Requires-Dist: pipreqs (>=0.5.0,<0.6.0) ; python_version < "3.13"
-Requires-Dist: pluggy (==1.5.0)
-Requires-Dist: prompt_toolkit (==3.0.51)
-Requires-Dist: propcache (==0.2.1)
-Requires-Dist: pydantic (>=2.9.0,<2.11.0)
-Requires-Dist: pydantic-extra-types (==2.9.0)
-Requires-Dist: pydantic_core (>=2.23.4,<2.24.0)
-Requires-Dist: pytest (==8.3.4)
-Requires-Dist: pytest-asyncio (==1.1.0)
-Requires-Dist: pytest-mock (==3.14.0)
-Requires-Dist: python-dotenv (==1.0.1)
-Requires-Dist: qrcode (==8.0)
-Requires-Dist: regex (==2024.11.6)
-Requires-Dist: reportlab (==4.3.1)
-Requires-Dist: requests (==2.32.3)
-Requires-Dist: rich (==13.9.4)
-Requires-Dist: smmap (==5.0.2)
-Requires-Dist: sniffio (==1.3.1)
-Requires-Dist: structlog (==24.4.0)
-Requires-Dist: tiktoken (==0.8.0)
-Requires-Dist: tomli (==2.2.1)
-Requires-Dist: tqdm (==4.67.1)
-Requires-Dist: tree-sitter (==0.23.2)
-Requires-Dist: tree-sitter-python (==0.23.4)
-Requires-Dist: typing_extensions (==4.12.2)
-Requires-Dist: urllib3 (==2.3.0)
-Requires-Dist: yarl (==1.18.3)
+Requires-Dist: packaging (>=25.0)
+Requires-Dist: pdfplumber (>=0.11.0)
+Requires-Dist: pipreqs (>=0.5.0) ; python_version < "3.13"
+Requires-Dist: prompt_toolkit (>=3.0.50)
+Requires-Dist: protollm (>=0.1.6)
+Requires-Dist: pydantic (>=2.9.0,<3.0.0)
+Requires-Dist: qrcode (>=7.4.0)
+Requires-Dist: reportlab (>=4.2.0,<5.0.0)
+Requires-Dist: structlog (>=24.4.0)
+Requires-Dist: tiktoken (>=0.8.0)
+Requires-Dist: tomli (>=2.0.0)
+Requires-Dist: tree-sitter (>=0.23.0)
+Requires-Dist: tree-sitter-python (>=0.23.0)
 Project-URL: Documentation, https://itmo-nss-team.github.io/Open-Source-Advisor/
 Project-URL: Homepage, https://github.com/aimclub/OSA
 Project-URL: Issues, https://github.com/aimclub/OSA/issues
@@ -123,8 +81,6 @@ It also generates advices and recommendations for the repository.
 
 OSA is currently under development, so not all features are implemented.
 
-
-
 ---
 
 ## How it works?
@@ -164,7 +120,7 @@ Here is a short video:
 4. **Various LLMs**: Use OSA with an LLM accessible via API (e.g., OpenAI, VseGPT, Ollama), a local server, or try
    an [osa_bot](https://github.com/osa-bot) hosted on ITMO servers.
 
-5. **GitHub Action Workflow Generator**: Automatically generates customizable CI/CD workflows for Python repositories,
+5. **Workflow Generator**: Automatically generates customizable CI/CD workflows for Python repositories,
    including unit tests, code formatting, PEP 8 compliance checks, and PyPI publication.
 
 ---
@@ -224,8 +180,9 @@ docker build --build-arg GIT_USER_NAME="your-user-name" --build-arg GIT_USER_EMA
 
 OSA requires Python 3.10 or higher.
 
-File `.env` is required to specify GitHub/GitLab/Gitverse token (GIT_TOKEN) and LLM API key (OPENAI_API_KEY or
-AUTHORIZATION_KEY)
+The .env file is required to specify the LLM API key (OPENAI_API_KEY or AUTHORIZATION_KEY) and optionally a Git token. The Git token (GIT_TOKEN) may be omitted if you plan to work with a public repository without creating a fork (using the --no-fork option).
+
+Alternatively, instead of GIT_TOKEN, you can use GITHUB_TOKEN, GITLAB_TOKEN, or GITVERSE_TOKEN for GitHub, GitLab, and Gitverse respectively.
 
 When running `osa-tool` from CLI, you need to set the GIT_TOKEN and API key first:
 
@@ -256,18 +213,18 @@ Run Open-Source-Advisor using the following command:
 [<img align="center" src="https://img.shields.io/badge/Pip-3776AB.svg?style={badge_style}&logo=pypi&logoColor=white" />](https://pypi.org/project/pip/)
 
 ```sh
-python -m osa_tool.run -r {repository} [--api {api}] [--base-url {base_url}] [--model {model_name}] [--article {article}] [--convert-notebooks {notebook_paths}]
+python -m osa_tool.run -r {repository} [--api {api}] [--base-url {base_url}] [--model {model_name}] [--attachment {article}] [--convert-notebooks {notebook_paths}]
 ```
 
 **Using `docker`** &nbsp;
 [<img align="center" src="https://img.shields.io/badge/Docker-2CA5E0.svg?style={badge_style}&logo=docker&logoColor=white" />](https://www.docker.com/)
 
 ```sh
-docker run --env-file .env {image-name} -r {repository} [--api {api}] [--base-url {base_url}] [--model {model_name}] [--article {article}] [--convert-notebooks {notebook_paths}]
+docker run --env-file .env {image-name} -r {repository} [--api {api}] [--base-url {base_url}] [--model {model_name}] [--attachment {article}] [--convert-notebooks {notebook_paths}]
 ```
 
-The --article option enables you to choose a README template for a repository based on an article. You can provide
-either a link to a PDF file of the article or a path to a local PDF file after the --article option. If you are using
+The --attachment option enables you to choose a README template for a repository based on an article. You can provide
+either a link to a PDF file of the article or a path to a local PDF file after the --attachment option. If you are using
 Docker, ensure that you upload the PDF file to the OSA folder before building the image, then, specify the path as
 /app/OSA/... or just use volume mounting to access the file.
 
@@ -287,7 +244,7 @@ documentation, see the [Workflow Generator README](./osa_tool/workflow/README.md
 | `--top_p`            | Nucleus sampling probability                                                        | `None`                      |
 | `--temperature`      | Sampling temperature to use for the LLM output (0 = deterministic, 1 = creative).   | `None`                      |
 | `--max_tokens`       | Maximum number of tokens the model can generate in a single response                | `None`                      |
-| `--article`          | Link to the pdf file of the article                                                 | `None`                      |
+| `--attachment`       | Path to a local PDF or .docx file, or a URL to a PDF resource                       | `None`                      |
 | `-m`, `--mode`       | Operation mode for repository processing: `basic`, `auto` (default), or `advanced`. | `auto`                      |
 | `--delete-dir`       | Enable deleting the downloaded repository after processing                          | `disabled`                  |
 | `--no-fork`          | Avoid create fork for target repository                                             | `False`                     |

{osa_tool-0.2.3 → osa_tool-0.2.4.0}/README.md

@@ -36,8 +36,6 @@ It also generates advices and recommendations for the repository.
 
 OSA is currently under development, so not all features are implemented.
 
-
-
 ---
 
 ## How it works?
@@ -77,7 +75,7 @@ Here is a short video:
 4. **Various LLMs**: Use OSA with an LLM accessible via API (e.g., OpenAI, VseGPT, Ollama), a local server, or try
    an [osa_bot](https://github.com/osa-bot) hosted on ITMO servers.
 
-5. **GitHub Action Workflow Generator**: Automatically generates customizable CI/CD workflows for Python repositories,
+5. **Workflow Generator**: Automatically generates customizable CI/CD workflows for Python repositories,
    including unit tests, code formatting, PEP 8 compliance checks, and PyPI publication.
 
 ---
@@ -137,8 +135,9 @@ docker build --build-arg GIT_USER_NAME="your-user-name" --build-arg GIT_USER_EMA
 
 OSA requires Python 3.10 or higher.
 
-File `.env` is required to specify GitHub/GitLab/Gitverse token (GIT_TOKEN) and LLM API key (OPENAI_API_KEY or
-AUTHORIZATION_KEY)
+The .env file is required to specify the LLM API key (OPENAI_API_KEY or AUTHORIZATION_KEY) and optionally a Git token. The Git token (GIT_TOKEN) may be omitted if you plan to work with a public repository without creating a fork (using the --no-fork option).
+
+Alternatively, instead of GIT_TOKEN, you can use GITHUB_TOKEN, GITLAB_TOKEN, or GITVERSE_TOKEN for GitHub, GitLab, and Gitverse respectively.
 
 When running `osa-tool` from CLI, you need to set the GIT_TOKEN and API key first:
 
@@ -169,18 +168,18 @@ Run Open-Source-Advisor using the following command:
 [<img align="center" src="https://img.shields.io/badge/Pip-3776AB.svg?style={badge_style}&logo=pypi&logoColor=white" />](https://pypi.org/project/pip/)
 
 ```sh
-python -m osa_tool.run -r {repository} [--api {api}] [--base-url {base_url}] [--model {model_name}] [--article {article}] [--convert-notebooks {notebook_paths}]
+python -m osa_tool.run -r {repository} [--api {api}] [--base-url {base_url}] [--model {model_name}] [--attachment {article}] [--convert-notebooks {notebook_paths}]
 ```
 
 **Using `docker`** &nbsp;
 [<img align="center" src="https://img.shields.io/badge/Docker-2CA5E0.svg?style={badge_style}&logo=docker&logoColor=white" />](https://www.docker.com/)
 
 ```sh
-docker run --env-file .env {image-name} -r {repository} [--api {api}] [--base-url {base_url}] [--model {model_name}] [--article {article}] [--convert-notebooks {notebook_paths}]
+docker run --env-file .env {image-name} -r {repository} [--api {api}] [--base-url {base_url}] [--model {model_name}] [--attachment {article}] [--convert-notebooks {notebook_paths}]
 ```
 
-The --article option enables you to choose a README template for a repository based on an article. You can provide
-either a link to a PDF file of the article or a path to a local PDF file after the --article option. If you are using
+The --attachment option enables you to choose a README template for a repository based on an article. You can provide
+either a link to a PDF file of the article or a path to a local PDF file after the --attachment option. If you are using
 Docker, ensure that you upload the PDF file to the OSA folder before building the image, then, specify the path as
 /app/OSA/... or just use volume mounting to access the file.
 
@@ -200,7 +199,7 @@ documentation, see the [Workflow Generator README](./osa_tool/workflow/README.md
 | `--top_p`            | Nucleus sampling probability                                                        | `None`                      |
 | `--temperature`      | Sampling temperature to use for the LLM output (0 = deterministic, 1 = creative).   | `None`                      |
 | `--max_tokens`       | Maximum number of tokens the model can generate in a single response                | `None`                      |
-| `--article`          | Link to the pdf file of the article                                                 | `None`                      |
+| `--attachment`       | Path to a local PDF or .docx file, or a URL to a PDF resource                       | `None`                      |
 | `-m`, `--mode`       | Operation mode for repository processing: `basic`, `auto` (default), or `advanced`. | `auto`                      |
 | `--delete-dir`       | Enable deleting the downloaded repository after processing                          | `disabled`                  |
 | `--no-fork`          | Avoid create fork for target repository                                             | `False`                     |

{osa_tool-0.2.3 → osa_tool-0.2.4.0}/osa_tool/aboutgen/about_generator.py

@@ -2,11 +2,12 @@ import os
 import re
 from typing import List
 
-from osa_tool.aboutgen.prompts_about_config import PromptAboutLoader
 from osa_tool.config.settings import ConfigLoader
 from osa_tool.git_agent.git_agent import GitAgent
 from osa_tool.models.models import ModelHandler, ModelHandlerFactory
-from osa_tool.utils import extract_readme_content, logger, parse_folder_name
+from osa_tool.utils.logger import logger
+from osa_tool.utils.prompts_builder import PromptLoader, PromptBuilder
+from osa_tool.utils.utils import extract_readme_content, parse_folder_name
 
 HOMEPAGE_KEYS = [
     "documentation",
@@ -23,16 +24,15 @@ HOMEPAGE_KEYS = [
 class AboutGenerator:
     """Generates Git repository About section content."""
 
-    def __init__(self, config_loader: ConfigLoader, git_agent: GitAgent):
+    def __init__(self, config_loader: ConfigLoader, prompts: PromptLoader, git_agent: GitAgent):
         self.config = config_loader.config
+        self.prompts = prompts
         self.model_handler: ModelHandler = ModelHandlerFactory.build(self.config)
         self.repo_url = self.config.git.repository
         self.metadata = git_agent.metadata
         self.base_path = os.path.join(os.getcwd(), parse_folder_name(self.repo_url))
         self.readme_content = extract_readme_content(self.base_path)
-        self.prompts = PromptAboutLoader().prompts
         self.validate_topics = git_agent.validate_topics
-
         self._content: dict | None = None
 
     def generate_about_content(self) -> None:
@@ -92,10 +92,13 @@ class AboutGenerator:
             logger.warning("No README content found. Cannot generate description.")
             return ""
 
-        formatted_prompt = self.prompts.description.format(readme_content=self.readme_content)
+        prompt = PromptBuilder.render(
+            self.prompts.get("about_section.description"),
+            readme_content=self.readme_content,
+        )
 
         try:
-            description = self.model_handler.send_request(formatted_prompt)
+            description = self.model_handler.send_request(prompt)
             logger.debug(f"Generated description: {description}")
             return description[:350]
         except Exception as e:
@@ -123,14 +126,15 @@ class AboutGenerator:
                 logger.warning(f"{amount} topics already exist in the metadata. Skipping generation.")
                 return existing_topics
 
-        formatted_prompt = self.prompts.topics.format(
+        prompt = PromptBuilder.render(
+            self.prompts.get("about_section.topics"),
+            readme_content=self.readme_content,
             amount=amount,
             topics=existing_topics,
-            readme_content=self.readme_content,
         )
 
         try:
-            response = self.model_handler.send_request(formatted_prompt)
+            response = self.model_handler.send_request(prompt)
             topics = [topic.strip().lower().replace(" ", "-") for topic in response.split(",") if topic.strip()]
             logger.debug(f"Generated topics from LLM: {topics}")
             validated_topics = self.validate_topics(topics)
@@ -181,8 +185,11 @@ class AboutGenerator:
     def _analyze_urls(self, urls: List[str]) -> List[str]:
         """Generates LLM prompt for URL analysis"""
         logger.info(f"Analyzing {len(urls)} project URLs...")
-        formatted_prompt = self.prompts.analyze_urls.format(project_url=self.repo_url, urls=", ".join(urls))
-        response = self.model_handler.send_request(formatted_prompt)
+
+        prompt = PromptBuilder.render(
+            self.prompts.get("about_section.analyze_urls"), project_url=self.repo_url, urls=", ".join(urls)
+        )
+        response = self.model_handler.send_request(prompt)
         if not response:
             return []
 

{osa_tool-0.2.3 → osa_tool-0.2.4.0}/osa_tool/analytics/metadata.py

@@ -8,7 +8,8 @@ import requests
 from dotenv import load_dotenv
 from requests import HTTPError
 
-from osa_tool.utils import get_base_repo_url, logger
+from osa_tool.utils.logger import logger
+from osa_tool.utils.utils import get_base_repo_url
 
 load_dotenv()
 
@@ -80,34 +81,38 @@ class MetadataLoader(ABC):
             RepositoryMetadata: Parsed repository metadata.
         """
         try:
-            return cls._load_platform_data(repo_url)
-
-        except HTTPError as http_exc:
-            status_code = getattr(http_exc.response, "status_code", None)
-            logger.error(f"Error while fetching repository metadata: {http_exc}")
-
-            if status_code == 401:
-                logger.error("Authentication failed: please check your Git token (missing or expired).")
-            elif status_code == 404:
-                logger.error("Repository not found: please check the repository URL.")
-            elif status_code == 403:
-                logger.error("Access denied: your token may lack sufficient permissions or you hit a rate limit.")
-            else:
-                logger.error("Unexpected HTTP error occurred while accessing the repository metadata.")
-            raise
-
-        except Exception as exc:
-            logger.error(f"Unexpected error while fetching repository metadata: {exc}")
-            raise
+            return cls._load_platform_data(repo_url, use_token=False)
+        except Exception:
+            try:
+                return cls._load_platform_data(repo_url, use_token=True)
+
+            except HTTPError as http_exc:
+                status_code = getattr(http_exc.response, "status_code", None)
+                logger.error(f"Error while fetching repository metadata: {http_exc}")
+
+                if status_code == 401:
+                    logger.error("Authentication failed: please check your Git token (missing or expired).")
+                elif status_code == 404:
+                    logger.error("Repository not found: please check the repository URL.")
+                elif status_code == 403:
+                    logger.error("Access denied: your token may lack sufficient permissions or you hit a rate limit.")
+                else:
+                    logger.error("Unexpected HTTP error occurred while accessing the repository metadata.")
+                raise
+
+            except Exception as exc:
+                logger.error(f"Unexpected error while fetching repository metadata: {exc}")
+                raise
 
     @classmethod
     @abstractmethod
-    def _load_platform_data(cls, repo_url: str) -> RepositoryMetadata:
+    def _load_platform_data(cls, repo_url: str, use_token: bool) -> RepositoryMetadata:
         """
         Abstract method to load metadata from a platform-specific API.
 
         Args:
             repo_url (str): The full URL of the repository.
+            use_token (bool): Whether to use authentication token.
 
         Returns:
             RepositoryMetadata: Parsed repository metadata.
@@ -131,7 +136,7 @@ class MetadataLoader(ABC):
 
 class GitHubMetadataLoader(MetadataLoader):
     @classmethod
-    def _load_platform_data(cls, repo_url: str) -> RepositoryMetadata:
+    def _load_platform_data(cls, repo_url: str, use_token: bool) -> RepositoryMetadata:
         """
         Load GitHub repository metadata via GitHub API.
 
@@ -143,9 +148,12 @@ class GitHubMetadataLoader(MetadataLoader):
         """
         base_url = get_base_repo_url(repo_url)
         headers = {
-            "Authorization": f"token {os.getenv('GIT_TOKEN', os.getenv('GITHUB_TOKEN', ''))}",
             "Accept": "application/vnd.github.v3+json",
         }
+
+        if use_token:
+            headers["Authorization"] = f"token {os.getenv('GIT_TOKEN', os.getenv('GITHUB_TOKEN', ''))}"
+
         url = f"https://api.github.com/repos/{base_url}"
         response = requests.get(url=url, headers=headers)
         response.raise_for_status()
@@ -203,7 +211,7 @@ class GitHubMetadataLoader(MetadataLoader):
 
 class GitLabMetadataLoader(MetadataLoader):
     @classmethod
-    def _load_platform_data(cls, repo_url: str) -> RepositoryMetadata:
+    def _load_platform_data(cls, repo_url: str, use_token: bool) -> RepositoryMetadata:
         """
         Load GitLab repository metadata via GitLab API.
 
@@ -220,9 +228,12 @@ class GitLabMetadataLoader(MetadataLoader):
         gitlab_instance = gitlab_instance_match.group(1)
 
         headers = {
-            "Authorization": f"Bearer {os.getenv('GITLAB_TOKEN', os.getenv('GIT_TOKEN'))}",
             "Content-Type": "application/json",
         }
+
+        if use_token:
+            headers["Authorization"] = f"Bearer {os.getenv('GITLAB_TOKEN', os.getenv('GIT_TOKEN'))}"
+
         project_path = base_url.replace("/", "%2F")
         url = f"{gitlab_instance}/api/v4/projects/{project_path}"
 
@@ -289,7 +300,7 @@ class GitLabMetadataLoader(MetadataLoader):
 
 class GitverseMetadataLoader(MetadataLoader):
     @classmethod
-    def _load_platform_data(cls, repo_url: str) -> RepositoryMetadata:
+    def _load_platform_data(cls, repo_url: str, use_token: bool) -> RepositoryMetadata:
         """
         Load Gitverse repository metadata via Gitverse API.
 

{osa_tool-0.2.3 → osa_tool-0.2.4.0}/osa_tool/analytics/report_generator.py

@@ -1,10 +1,9 @@
 import os
 
-import tomli as tomllib
 from pydantic import ValidationError
 
 from osa_tool.analytics.metadata import RepositoryMetadata
-from osa_tool.analytics.prompt_builder import (
+from osa_tool.analytics.response_validation import (
     RepositoryReport,
     RepositoryStructure,
     ReadmeEvaluation,
@@ -15,18 +14,22 @@ from osa_tool.analytics.sourcerank import SourceRank
 from osa_tool.config.settings import ConfigLoader
 from osa_tool.models.models import ModelHandler, ModelHandlerFactory
 from osa_tool.readmegen.postprocessor.response_cleaner import JsonProcessor
-from osa_tool.utils import extract_readme_content, osa_project_root, parse_folder_name, logger
+from osa_tool.utils.logger import logger
+from osa_tool.utils.prompts_builder import PromptLoader, PromptBuilder
+from osa_tool.utils.utils import extract_readme_content, parse_folder_name
 
 
 class TextGenerator:
-    def __init__(self, config_loader: ConfigLoader, sourcerank: SourceRank, metadata: RepositoryMetadata):
+    def __init__(
+        self, config_loader: ConfigLoader, sourcerank: SourceRank, prompts: PromptLoader, metadata: RepositoryMetadata
+    ):
         self.config = config_loader.config
         self.sourcerank = sourcerank
+        self.prompts = prompts
+        self.metadata = metadata
         self.model_handler: ModelHandler = ModelHandlerFactory.build(self.config)
         self.repo_url = self.config.git.repository
-        self.metadata = metadata
         self.base_path = os.path.join(os.getcwd(), parse_folder_name(self.repo_url))
-        self.prompt_path = os.path.join(osa_project_root(), "config", "settings", "prompt_for_analysis.toml")
 
     def make_request(self) -> RepositoryReport:
         """
@@ -35,7 +38,16 @@ class TextGenerator:
         Returns:
             str: The generated repository analysis response from the model.
         """
-        response = self.model_handler.send_request(self._build_prompt())
+        response = self.model_handler.send_request(
+            PromptBuilder.render(
+                self.prompts.get("analysis.main_prompt"),
+                project_name=self.metadata.name,
+                metadata=self.metadata,
+                repository_tree=self.sourcerank.tree,
+                presence_files=self._extract_presence_files(),
+                readme_content=extract_readme_content(self.base_path),
+            )
+        )
         parsed_data = JsonProcessor.parse(response, expected_type=dict)
         try:
             parsed_report = RepositoryReport.model_validate(parsed_data)
@@ -55,30 +67,6 @@ class TextGenerator:
             logger.error(f"Unexpected error while parsing RepositoryReport: {e}")
             raise ValueError(f"Failed to process model response: {e}")
 
-    def _build_prompt(self) -> str:
-        """
-        Builds the prompt to be sent to the model for repository analysis.
-
-        This method loads the prompt structure from a file and formats it with values
-        extracted from the repository's metadata and other relevant information like
-        the project name, presence of key files, and repository tree.
-
-        Returns:
-            str: The formatted prompt to be used in the model request.
-        """
-        with open(self.prompt_path, "rb") as f:
-            prompts = tomllib.load(f)
-
-        main_prompt = prompts.get("prompt", {}).get("main_prompt", "")
-        prompt = main_prompt.format(
-            project_name=self.metadata.name,
-            metadata=self.metadata,
-            repository_tree=self.sourcerank.tree,
-            presence_files=self._extract_presence_files(),
-            readme_content=extract_readme_content(self.base_path),
-        )
-        return prompt
-
     def _extract_presence_files(self) -> list[str]:
         """
         Extracts information about the presence of key files in the repository.

{osa_tool-0.2.3 → osa_tool-0.2.4.0}/osa_tool/analytics/report_maker.py

@@ -21,16 +21,20 @@ from osa_tool.analytics.metadata import RepositoryMetadata
 from osa_tool.analytics.report_generator import TextGenerator
 from osa_tool.analytics.sourcerank import SourceRank
 from osa_tool.config.settings import ConfigLoader
-from osa_tool.utils import logger, osa_project_root
+from osa_tool.utils.logger import logger
+from osa_tool.utils.prompts_builder import PromptLoader
+from osa_tool.utils.utils import osa_project_root
 
 
 class ReportGenerator:
 
-    def __init__(self, config_loader: ConfigLoader, sourcerank: SourceRank, metadata: RepositoryMetadata):
+    def __init__(
+        self, config_loader: ConfigLoader, sourcerank: SourceRank, prompts: PromptLoader, metadata: RepositoryMetadata
+    ):
         self.config = config_loader.config
         self.sourcerank = sourcerank
         self.metadata = metadata
-        self.text_generator = TextGenerator(config_loader, self.sourcerank, self.metadata)
+        self.text_generator = TextGenerator(config_loader, self.sourcerank, prompts, self.metadata)
         self.repo_url = self.config.git.repository
         self.osa_url = "https://github.com/aimclub/OSA"
 

{osa_tool-0.2.3 → osa_tool-0.2.4.0}/osa_tool/analytics/sourcerank.py

@@ -2,7 +2,7 @@ import os
 import re
 
 from osa_tool.config.settings import ConfigLoader
-from osa_tool.utils import get_repo_tree, parse_folder_name
+from osa_tool.utils.utils import get_repo_tree, parse_folder_name
 
 
 class SourceRank:

osa_tool-0.2.3/osa_tool/config/settings/prompt_for_analysis.toml → osa_tool-0.2.4.0/osa_tool/config/prompts/analysis.toml

@@ -1,4 +1,4 @@
-[prompt]
+[prompts]
 main_prompt = """
 INPUT DATA: