osa_tool 0.2.0__tar.gz → 0.2.1__tar.gz

{osa_tool-0.2.0 → osa_tool-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osa_tool
-Version: 0.2.0
+Version: 0.2.1
 Summary: Tool that just makes your open source project better!
 License: BSD-3-Clause
 Author: ITMO-NSS-team
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: ProtoLLM (>=0.1.2)
 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)
@@ -137,6 +138,8 @@ Here is a short demo:
 - [Getting started](#getting-started)
 - [Examples](#examples)
 - [Documentation](#documentation)
+- [Chat with developers: OSA_helpdesk](#chat-with-developers-osa_helpdesk)
+- [Publications about OSA](#publications-about-osa)
 - [Contributing](#contributing)
 - [License](#license)
 - [Acknowledgments](#acknowledgments)
@@ -217,7 +220,7 @@ 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 token (GIT_TOKEN) and LLM API key (OPENAI_API_KEY or VSE_GPT_KEY)
+File `.env` is required to specify GitHub/GitLab/Gitverse token (GIT_TOKEN) and LLM API key (OPENAI_API_KEY or VSE_GPT_KEY)
 
 When running `osa-tool` from CLI, you need to set the GIT_TOKEN and API key first:
 
@@ -230,7 +233,7 @@ export GIT_TOKEN=<your_git_token>
 
 | Token name       | Description                                                                                                        | Mandatory |
 |------------------|--------------------------------------------------------------------------------------------------------------------|-----------|
-| `GIT_TOKEN`      | Personal GitHub/GitLab token used to clone private repositories, access metadata, and interact with the GitHub/GitLab API.       | Yes       |
+| `GIT_TOKEN`      | Personal GitHub/GitLab/Gitverse token used to clone private repositories, access metadata, and interact with its API.       | Yes       |
 | `OPENAI_API_KEY` | API key for accessing [OpenAI](https://platform.openai.com/docs/api-reference/introduction)'s language models.     | No        |
 | `VSE_GPT_KEY`    | API key for [vsegpt](https://vsegpt.ru/Docs/API) LLM provider compatible with OpenAI's API format.                 | No        |
 | `X-API-Key`      | API key for the [pepy.tech](https://pepy.tech/pepy-api) REST API, used to fetch Python package download statistics | No        |
@@ -265,11 +268,14 @@ documentation, see the [GitHub Action Workflow Generator README](./osa_tool/gith
 
 | Flag                 | Description                                                                         | Default                     |
 |----------------------|-------------------------------------------------------------------------------------|-----------------------------|
-| `-r`, `--repository` | URL of the GitHub repository (**Mandatory**)                                        |                             |
-| `-b`, `--branch`     | Branch name of the GitHub repository                                                | Default branch              |
-| `--api`              | LLM API service provider                                                            | `llama`                     |
+| `-r`, `--repository` | URL of the GitHub/GitLab/Gitverse repository (**Mandatory**)                        |                             |
+| `-b`, `--branch`     | Branch name of the repository                                                       | Default branch              |
+| `-o`, `--output`     | Path to the output directory                                                        | Current working directory   |
+| `--api`              | LLM API service provider                                                            | `itmo`                      |
 | `--base-url`         | URL of the provider compatible with API OpenAI                                      | `https://api.openai.com/v1` |
 | `--model`            | Specific LLM model to use                                                           | `gpt-3.5-turbo`             |
+| `--article`          | Link to the pdf file of the article                                                 | `None`                      |
+| `--translate-dirs`   | Enable automatic translation of the directory name into English                     | `disabled`                  |
 | `-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`                     |
@@ -287,7 +293,7 @@ the [CLI usage guide](./osa_tool/scheduler/README.md).
 
 Examples of generated README files are available in [examples](https://github.com/aimclub/OSA/tree/main/examples).
 
-URL of the GitHub repository, LLM API service provider (*optional*) and Specific LLM model to use (*optional*) are
+URL of the GitHub/GitLab/Gitverse repository, LLM API service provider (*optional*) and Specific LLM model to use (*optional*) are
 required to use the generator.
 
 To see available models go there:
@@ -296,12 +302,14 @@ To see available models go there:
 2. [OpenAI](https://platform.openai.com/docs/models)
 3. [Ollama](https://ollama.com/library)
 
-Local Llama ITMO:
+Local ITMO model:
 
 ```sh
-python -m osa_tool.run -r https://github.com/aimclub/OSA
+python -m osa_tool.run -r https://github.com/aimclub/OSA --base_url [ITMO_MODEL_URL]
 ```  
 
+For this API provider itmo model url must be specified in dotenv (ITMO_MODEL_URL=) or in the --base-url argument.
+
 OpenAI:
 
 ```sh
@@ -328,6 +336,12 @@ Detailed description of OSA API is available [here](https://aimclub.github.io/OS
 
 ---
 
+## Chat with developers: OSA_helpdesk
+
+In our Telegram chat [OSA_helpdesk](t.me/osa_helpdesk) you can ask questions about working with OSA and find the latest news about the project.
+
+---
+
 ## Publications about OSA
 
 In English:

{osa_tool-0.2.0 → osa_tool-0.2.1}/README.md

@@ -53,6 +53,8 @@ Here is a short demo:
 - [Getting started](#getting-started)
 - [Examples](#examples)
 - [Documentation](#documentation)
+- [Chat with developers: OSA_helpdesk](#chat-with-developers-osa_helpdesk)
+- [Publications about OSA](#publications-about-osa)
 - [Contributing](#contributing)
 - [License](#license)
 - [Acknowledgments](#acknowledgments)
@@ -133,7 +135,7 @@ 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 token (GIT_TOKEN) and LLM API key (OPENAI_API_KEY or VSE_GPT_KEY)
+File `.env` is required to specify GitHub/GitLab/Gitverse token (GIT_TOKEN) and LLM API key (OPENAI_API_KEY or VSE_GPT_KEY)
 
 When running `osa-tool` from CLI, you need to set the GIT_TOKEN and API key first:
 
@@ -146,7 +148,7 @@ export GIT_TOKEN=<your_git_token>
 
 | Token name       | Description                                                                                                        | Mandatory |
 |------------------|--------------------------------------------------------------------------------------------------------------------|-----------|
-| `GIT_TOKEN`      | Personal GitHub/GitLab token used to clone private repositories, access metadata, and interact with the GitHub/GitLab API.       | Yes       |
+| `GIT_TOKEN`      | Personal GitHub/GitLab/Gitverse token used to clone private repositories, access metadata, and interact with its API.       | Yes       |
 | `OPENAI_API_KEY` | API key for accessing [OpenAI](https://platform.openai.com/docs/api-reference/introduction)'s language models.     | No        |
 | `VSE_GPT_KEY`    | API key for [vsegpt](https://vsegpt.ru/Docs/API) LLM provider compatible with OpenAI's API format.                 | No        |
 | `X-API-Key`      | API key for the [pepy.tech](https://pepy.tech/pepy-api) REST API, used to fetch Python package download statistics | No        |
@@ -181,11 +183,14 @@ documentation, see the [GitHub Action Workflow Generator README](./osa_tool/gith
 
 | Flag                 | Description                                                                         | Default                     |
 |----------------------|-------------------------------------------------------------------------------------|-----------------------------|
-| `-r`, `--repository` | URL of the GitHub repository (**Mandatory**)                                        |                             |
-| `-b`, `--branch`     | Branch name of the GitHub repository                                                | Default branch              |
-| `--api`              | LLM API service provider                                                            | `llama`                     |
+| `-r`, `--repository` | URL of the GitHub/GitLab/Gitverse repository (**Mandatory**)                        |                             |
+| `-b`, `--branch`     | Branch name of the repository                                                       | Default branch              |
+| `-o`, `--output`     | Path to the output directory                                                        | Current working directory   |
+| `--api`              | LLM API service provider                                                            | `itmo`                      |
 | `--base-url`         | URL of the provider compatible with API OpenAI                                      | `https://api.openai.com/v1` |
 | `--model`            | Specific LLM model to use                                                           | `gpt-3.5-turbo`             |
+| `--article`          | Link to the pdf file of the article                                                 | `None`                      |
+| `--translate-dirs`   | Enable automatic translation of the directory name into English                     | `disabled`                  |
 | `-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`                     |
@@ -203,7 +208,7 @@ the [CLI usage guide](./osa_tool/scheduler/README.md).
 
 Examples of generated README files are available in [examples](https://github.com/aimclub/OSA/tree/main/examples).
 
-URL of the GitHub repository, LLM API service provider (*optional*) and Specific LLM model to use (*optional*) are
+URL of the GitHub/GitLab/Gitverse repository, LLM API service provider (*optional*) and Specific LLM model to use (*optional*) are
 required to use the generator.
 
 To see available models go there:
@@ -212,12 +217,14 @@ To see available models go there:
 2. [OpenAI](https://platform.openai.com/docs/models)
 3. [Ollama](https://ollama.com/library)
 
-Local Llama ITMO:
+Local ITMO model:
 
 ```sh
-python -m osa_tool.run -r https://github.com/aimclub/OSA
+python -m osa_tool.run -r https://github.com/aimclub/OSA --base_url [ITMO_MODEL_URL]
 ```  
 
+For this API provider itmo model url must be specified in dotenv (ITMO_MODEL_URL=) or in the --base-url argument.
+
 OpenAI:
 
 ```sh
@@ -244,6 +251,12 @@ Detailed description of OSA API is available [here](https://aimclub.github.io/OS
 
 ---
 
+## Chat with developers: OSA_helpdesk
+
+In our Telegram chat [OSA_helpdesk](t.me/osa_helpdesk) you can ask questions about working with OSA and find the latest news about the project.
+
+---
+
 ## Publications about OSA
 
 In English:

{osa_tool-0.2.0 → osa_tool-0.2.1}/osa_tool/aboutgen/about_generator.py

@@ -87,7 +87,6 @@ class AboutGenerator:
             str: A repository description (up to 150 characters) or an empty string
                  if README content is unavailable.
         """
-        logger.info("Generating repository description...")
         if self.metadata and self.metadata.description:
             logger.warning("Description already exists in metadata. Skipping generation.")
             return self.metadata.description
@@ -203,7 +202,7 @@ class AboutGenerator:
                 logger.error(f"Error validating topic '{topic}': {e}")
                 continue
 
-        logger.info(f"Validated {len(validated_topics)} topics out of {len(topics)}")
+        logger.info(f"Validated {len(validated_topics)} topics out of {len(topics)}.")
         return validated_topics
 
     def _validate_gitlab_topics(self, topics: List[str]) -> List[str]:
@@ -241,7 +240,7 @@ class AboutGenerator:
                 logger.error(f"Error validating topic '{topic}': {e}")
                 continue
 
-        logger.info(f"Validated {len(validated_topics)} topics out of {len(topics)}")
+        logger.info(f"Validated {len(validated_topics)} topics out of {len(topics)}.")
         return validated_topics
 
     def _validate_gitverse_topics(self, topics: List[str]) -> List[str]:

{osa_tool-0.2.0 → osa_tool-0.2.1}/osa_tool/analytics/metadata.py

@@ -6,6 +6,7 @@ from functools import lru_cache
 
 import requests
 from dotenv import load_dotenv
+from requests import HTTPError
 
 from osa_tool.utils import get_base_repo_url, logger
 
@@ -193,7 +194,7 @@ def _parse_repository_metadata_gitverse(repo_data: dict) -> RepositoryMetadata:
         issues_url=repo_data.get("issues_url"),
         language=repo_data.get("language", ""),
         languages=repo_data.get("languages", []),
-        topics=repo_data.get("topics", []),
+        topics=repo_data.get("topics", []) or [],
         has_wiki=repo_data.get("has_wiki", False),
         has_issues=repo_data.get("has_issues", False),
         has_projects=repo_data.get("has_projects", False),
@@ -206,7 +207,7 @@ def _parse_repository_metadata_gitverse(repo_data: dict) -> RepositoryMetadata:
 
 
 @lru_cache(maxsize=1)
-def load_data_metadata(repo_url: str) -> RepositoryMetadata | None:
+def load_data_metadata(repo_url: str) -> RepositoryMetadata:
     """Retrieve repository metadata from any supported platform."""
     try:
         platform = detect_platform(repo_url)
@@ -219,9 +220,23 @@ def load_data_metadata(repo_url: str) -> RepositoryMetadata | None:
         else:
             return _load_gitverse_metadata(base_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"Error while fetching repository metadata: {exc}")
-        return None
+        logger.error(f"Unexpected error while fetching repository metadata: {exc}")
+        raise
 
 
 def _load_github_metadata(base_url: str) -> RepositoryMetadata:
@@ -236,7 +251,7 @@ def _load_github_metadata(base_url: str) -> RepositoryMetadata:
     response.raise_for_status()
 
     metadata = response.json()
-    logger.info(f"Successfully fetched GitHub metadata for repository: {base_url}")
+    logger.info(f"Successfully fetched GitHub metadata for repository: '{base_url}'")
     return _parse_repository_metadata_github(metadata)
 
 
@@ -256,7 +271,7 @@ def _load_gitlab_metadata(repo_url: str, base_url: str) -> RepositoryMetadata:
     response.raise_for_status()
 
     metadata = response.json()
-    logger.info(f"Successfully fetched GitLab metadata for repository: {base_url}")
+    logger.info(f"Successfully fetched GitLab metadata for repository: '{base_url}'")
     return _parse_repository_metadata_gitlab(metadata)
 
 
@@ -274,5 +289,5 @@ def _load_gitverse_metadata(base_url: str) -> RepositoryMetadata:
     response.raise_for_status()
 
     metadata = response.json()
-    logger.info(f"Successfully fetched Gitverse metadata for repository: {base_url}")
+    logger.info(f"Successfully fetched Gitverse metadata for repository: '{base_url}'")
     return _parse_repository_metadata_gitverse(metadata)

{osa_tool-0.2.0 → osa_tool-0.2.1}/osa_tool/analytics/run_report_gen.py

@@ -124,7 +124,7 @@ def parse_arguments() -> argparse.Namespace:
     Returns:
         argparse.Namespace: Parsed arguments including:
           - table_path: path to input table file (.csv or .xlsx)
-          - api: choice of LLM API provider ("llama", "openai", "ollama")
+          - api: choice of LLM API provider ("itmo", "openai", "ollama")
           - base_url: base URL of the API provider
           - model: LLM model name to use
     """
@@ -134,7 +134,7 @@ def parse_arguments() -> argparse.Namespace:
         "--table-path", type=str, help="Path to an Excel (.xlsx) or CSV file containing tabular data.", required=True
     )
     parser.add_argument(
-        "--api", type=str, choices=["llama", "openai", "ollama"], help="LLM API service provider.", default="llama"
+        "--api", type=str, choices=["itmo", "openai", "ollama"], help="LLM API service provider.", default="itmo"
     )
     parser.add_argument(
         "--base-url",

{osa_tool-0.2.0 → osa_tool-0.2.1}/osa_tool/analytics/sourcerank.py

@@ -38,7 +38,7 @@ class SourceRank:
         return bool(pattern.search(self.tree))
 
     def contributing_presence(self) -> bool:
-        pattern = re.compile(r"\b\w*contribut\w*\.(md|rst|txt)$", re.IGNORECASE)
+        pattern = re.compile(r"\b\w*contribut\w*\.(md|rst|txt)$", re.IGNORECASE | re.MULTILINE)
         return bool(pattern.search(self.tree))
 
     def requirements_presence(self) -> bool:

{osa_tool-0.2.0 → osa_tool-0.2.1}/osa_tool/config/settings/arguments.yaml

@@ -24,6 +24,13 @@ web_mode:
     without launching the interactive CLI editor.
   default: false
 
+output:
+  aliases: ["-o","--output"]
+  type: str
+  description: "Path to the output directory"
+  example: "path/to/directory"
+  required: false
+
 branch:
   aliases: [ "-b", "--branch" ]
   type: str
@@ -35,8 +42,8 @@ api:
   aliases: [ "--api" ]
   type: str
   description: "LLM API service provider"
-  choices: [ "llama", "openai", "ollama" ]
-  default: "llama"
+  choices: [ "itmo", "openai", "ollama" ]
+  default: "itmo"
 
 base_url:
   aliases: [ "--base-url" ]
@@ -159,7 +166,7 @@ refine_readme:
 requirements:
   aliases: ["--requirements"]
   type: flag
-  description: "Generate a requirements.txt file based on repository content."
+  description: "Generate or refine a requirements.txt file based on repository content."
   default: false
 
 organize:

{osa_tool-0.2.0 → osa_tool-0.2.1}/osa_tool/config/settings/config.toml

@@ -22,12 +22,12 @@ repository = "https://github.com/aimclub/FEDOT"
 # Language Model API Settings
 [llm]
 api = "openai"
+rate_limit = 10
 url = "https://api.openai.com/v1"
 context_window = 4096
 encoder = "cl100k_base"
 host_name = "https://api.openai.com/v1"
 localhost = "http://localhost:11434/"
-itmo_local_url = "http://10.32.15.21:6672"
 model = "gpt-3.5-turbo"
 path = "generate"
 temperature = 0.05

{osa_tool-0.2.0 → osa_tool-0.2.1}/osa_tool/config/settings.py

@@ -46,12 +46,12 @@ class ModelSettings(BaseModel):
     """
 
     api: str
+    rate_limit: PositiveInt
     url: str
     context_window: PositiveInt
     encoder: str
     host_name: AnyHttpUrl
     localhost: AnyHttpUrl
-    itmo_local_url: AnyHttpUrl
     model: str
     path: str
     temperature: NonNegativeFloat

{osa_tool-0.2.0 → osa_tool-0.2.1}/osa_tool/git_agent/git_agent.py

@@ -246,7 +246,7 @@ class GitAgent:
         response_check = requests.get(url, headers=headers)
 
         if response_check.status_code == 204:
-            logger.info(f"GitHub repository {base_repo} is already starred.")
+            logger.info(f"GitHub repository '{base_repo}' is already starred.")
             return
         elif response_check.status_code != 404:
             logger.error(f"Failed to check star status: {response_check.status_code} - {response_check.text}")
@@ -255,7 +255,7 @@ class GitAgent:
         response_star = requests.put(url, headers=headers)
 
         if response_star.status_code == 204:
-            logger.info(f"GitHub repository {base_repo} has been starred successfully.")
+            logger.info(f"GitHub repository '{base_repo}' has been starred successfully.")
         else:
             logger.error(f"Failed to star repository: {response_star.status_code} - {response_star.text}")
             raise ValueError("Failed to star repository.")
@@ -279,10 +279,10 @@ class GitAgent:
         response = requests.post(url, headers=headers)
 
         if response.status_code == 304:
-            logger.info(f"GitLab repository {base_repo} is already starred.")
+            logger.info(f"GitLab repository '{base_repo}' is already starred.")
             return
         elif response.status_code == 201:
-            logger.info(f"GitLab repository {base_repo} has been starred successfully.")
+            logger.info(f"GitLab repository '{base_repo}' has been starred successfully.")
             return
         else:
             logger.error(f"Failed to star GitLab repository: {response.status_code} - {response.text}")
@@ -303,7 +303,7 @@ class GitAgent:
         response_check = requests.get(url, headers=headers)
 
         if response_check.status_code == 204:
-            logger.info(f"Gitverse repository {base_repo} is already starred.")
+            logger.info(f"Gitverse repository '{base_repo}' is already starred.")
             return
         elif response_check.status_code != 404:
             logger.error(f"Failed to check star status: {response_check.status_code} - {response_check.text}")
@@ -312,7 +312,7 @@ class GitAgent:
         response_star = requests.put(url, headers=headers)
 
         if response_star.status_code == 204:
-            logger.info(f"Gitverse repository {base_repo} has been starred successfully.")
+            logger.info(f"Gitverse repository '{base_repo}' has been starred successfully.")
             return
         else:
             logger.error(f"Failed to star Gitverse repository: {response_star.status_code} - {response_star.text}")
@@ -342,7 +342,7 @@ class GitAgent:
         else:
             try:
                 logger.info(
-                    f"Cloning the {self.base_branch} branch from {self.repo_url} into directory {self.clone_dir}..."
+                    f"Cloning the '{self.base_branch}' branch from {self.repo_url} into directory {self.clone_dir}..."
                 )
                 self.repo = Repo.clone_from(
                     url=self._get_auth_url(),
@@ -352,7 +352,15 @@ class GitAgent:
                 )
                 logger.info("Cloning completed")
             except GitCommandError as e:
-                logger.error(f"Cloning failed: {repr(e)}")
+                stderr = e.stderr or ""
+                logger.error(f"Cloning failed: {e}")
+
+                if "remote branch" in stderr and "not found" in stderr:
+                    logger.error(
+                        f"Branch '{self.base_branch}' not found in the remote repository. Please check the branch name."
+                    )
+                else:
+                    logger.error("An unexpected Git error occurred while cloning the repository.")
                 raise
 
     def create_and_checkout_branch(self, branch: str = None) -> None:
@@ -395,8 +403,18 @@ class GitAgent:
 
         logger.info("Committing changes...")
         self.repo.git.add(".")
-        self.repo.git.commit("-m", commit_message)
-        logger.info("Commit completed.")
+
+        try:
+            self.repo.git.commit("-m", commit_message)
+            logger.info("Commit completed.")
+        except GitCommandError as e:
+            if "nothing to commit" in str(e):
+                logger.warning("Nothing to commit: working tree clean")
+                if self.pr_report_body:
+                    logger.info(self.pr_report_body)
+                return False
+            else:
+                raise
 
         logger.info(f"Pushing changes to branch {branch} in fork...")
         self.repo.git.remote("set-url", "origin", self._get_auth_url(self.fork_url))
@@ -620,16 +638,18 @@ class GitAgent:
             raise ValueError("Fork URL is not set. Please create a fork first.")
 
         base_repo = get_base_repo_url(self.repo_url)
-        logger.info(f"Updating 'About' section for base repository - {self.repo_url}")
+        logger.info(f"Updating 'base' repository '{base_repo}'...")
 
         if self.platform == "github":
             self._update_github_about_section(base_repo, about_content)
             fork_repo = get_base_repo_url(self.fork_url)
+            logger.info(f"Updating 'fork' repository '{fork_repo}'...")
             self._update_github_about_section(fork_repo, about_content)
         elif self.platform == "gitlab":
             self._update_gitlab_about_section(base_repo, about_content)
         elif self.platform == "gitverse":
-            self._update_gitverse_about_section(base_repo, about_content)
+            logger.warning("The ability to update repository data via API is not yet available on Gitverse.")
+            # self._update_gitverse_about_section(base_repo, about_content)
 
     def _update_github_about_section(self, repo_path: str, about_content: dict):
         """Update GitHub repository about section.
@@ -652,18 +672,18 @@ class GitAgent:
         response = requests.patch(url, headers=headers, json=about_data)
 
         if response.status_code in {200, 201}:
-            logger.info(f"Successfully updated GitHub repository description and homepage.")
+            logger.info(f"Successfully updated description/homepage.")
         else:
-            logger.error(f"{response.status_code} - Failed to update description and homepage for {repo_path}.")
+            logger.error(f"{response.status_code} - Failed to update description/homepage.")
 
         url = f"https://api.github.com/repos/{repo_path}/topics"
         topics_data = {"names": about_content["topics"]}
         response = requests.put(url, headers=headers, json=topics_data)
 
         if response.status_code in {200, 201}:
-            logger.info(f"Successfully updated GitHub repository topics.")
+            logger.info(f"Successfully updated topics.")
         else:
-            logger.error(f"{response.status_code} - Failed to update topics for {repo_path}.")
+            logger.error(f"{response.status_code} - Failed to update topics.")
 
     def _update_gitlab_about_section(self, repo_path: str, about_content: dict):
         """Update GitLab repository about section.
@@ -709,7 +729,6 @@ class GitAgent:
 
         about_data = {
             "description": about_content["description"],
-            "homepage": about_content["homepage"],
             "topics": about_content["topics"],
         }
 

{osa_tool-0.2.0 → osa_tool-0.2.1}/osa_tool/models/models.py

@@ -1,3 +1,5 @@
+import os
+import asyncio
 from abc import ABC, abstractmethod
 from uuid import uuid4
 
@@ -27,6 +29,12 @@ class ModelHandler(ABC):
     @abstractmethod
     def send_request(self, prompt: str) -> str: ...
 
+    @abstractmethod
+    async def async_request(self, prompt: str) -> str: ...
+
+    @abstractmethod
+    async def generate_concurrently(self, prompts: list[str]) -> list: ...
+
     def initialize_payload(self, config: Settings, prompt: str) -> None:
         """
         Initializes the payload for the instance.
@@ -54,17 +62,6 @@ class PayloadFactory:
      __init__:
         Initializes the instance with a unique job ID, temperature, tokens limit, prompt, and roles. The 'config' parameter should include 'llm' with 'temperature' and 'tokens' attributes. The 'prompt' parameter is the initial user prompt.
 
-     to_payload:
-        Converts the instance variables to a dictionary payload. This method takes the instance variables job_id, temperature, tokens_limit, and prompt and packages them into a dictionary. The returned dictionary has the following structure:
-            {
-                "job_id": job_id,
-                "meta": {
-                    "temperature": temperature,
-                    "tokens_limit": tokens_limit,
-                },
-                "content": prompt,
-            }
-
      to_payload_completions:
         Converts the instance variables to a dictionary payload for completions. This method returns a dictionary with keys 'job_id', 'meta', and 'messages'. The 'meta' key contains a nested dictionary with keys 'temperature' and 'tokens_limit'. The values for these keys are taken from the instance variables of the same names.
     """
@@ -90,36 +87,6 @@ class PayloadFactory:
             {"role": "user", "content": prompt},
         ]
 
-    def to_payload(self) -> dict:
-        """
-        Converts the instance variables to a dictionary payload.
-
-        This method takes the instance variables job_id, temperature, tokens_limit, and prompt and
-        packages them into a dictionary. This can be useful for serialization or for sending the
-        instance data over a network.
-
-        No parameters are required as it uses instance variables.
-
-        Returns:
-            dict: A dictionary containing the instance variables. The dictionary has the following structure:
-                {
-                    "job_id": job_id,
-                    "meta": {
-                        "temperature": temperature,
-                        "tokens_limit": tokens_limit,
-                    },
-                    "content": prompt,
-                }
-        """
-        return {
-            "job_id": self.job_id,
-            "meta": {
-                "temperature": self.temperature,
-                "tokens_limit": self.tokens_limit,
-            },
-            "content": self.prompt,
-        }
-
     def to_payload_completions(self) -> dict:
         """
         Converts the instance variables to a dictionary payload for completions.
@@ -197,10 +164,39 @@ class ProtollmHandler(ModelHandler):
         response = self.client.invoke(messages)
         return response.content
 
+    async def async_request(self, prompt: str) -> str:
+        """
+        Asynchronous alternative of send_request method.
+        This method do the same things in general.
+
+        Args:
+            prompt: The prompt to initialize the payload with.
+
+        Returns:
+            str: The response received from the request.
+        """
+        self.initialize_payload(self.config, prompt)
+        response = await self.client.ainvoke(self.payload["messages"])
+        return response.content
+
+    async def generate_concurrently(self, prompts: list[str]) -> list[str]:
+        """
+        Sends a batch of requests to the specified llm server endpoint.
+        Requests would be sent in concurrent format and processed in the order of their input.
+
+        Args:
+            prompts: The batch of prompts to send on llm server endpoint.
+
+        Returns:
+            list[str]: The list of responses from awaited coroutines.
+        """
+        coroutines = [self.async_request(p) for p in prompts]
+        return await asyncio.gather(*coroutines)
+
     def _build_model_url(self) -> str:
         """Builds the model URL based on the LLM API type."""
         url_templates = {
-            "llama": f"self_hosted;{self.config.llm.itmo_local_url};{self.config.llm.model}",
+            "itmo": f"self_hosted;{os.getenv('ITMO_MODEL_URL', self.config.llm.url)};{self.config.llm.model}",
             "ollama": f"ollama;{self.config.llm.localhost};{self.config.llm.model}",
         }
         return url_templates.get(self.config.llm.api, f"{self.config.llm.url};{self.config.llm.model}")
@@ -229,12 +225,8 @@ class ProtollmHandler(ModelHandler):
             None
         """
         dotenv.load_dotenv()
-        connector_creator = create_llm_connector
-
-        model_url = self._build_model_url()
-        llm_params = self._get_llm_params()
 
-        self.client = connector_creator(model_url, **llm_params)
+        self.client = create_llm_connector(model_url=self._build_model_url(), **self._get_llm_params())
 
 
 class ModelHandlerFactory:
@@ -249,7 +241,7 @@ class ModelHandlerFactory:
     """
 
     @classmethod
-    def build(cls, config: Settings) -> ModelHandler:
+    def build(cls, config: Settings) -> ProtollmHandler:
         """
         Builds and returns a handler based on the configuration of the class.