hirundo 0.1.7__py3-none-any.whl → 0.1.9__py3-none-any.whl

hirundo/enum.py

@@ -1,14 +1,15 @@
 from enum import Enum
 
 
-class LabellingType(str, Enum):
+class LabelingType(str, Enum):
     """
-    Enum indicate what type of labelling is used for the given dataset.
+    Enum indicate what type of labeling is used for the given dataset.
     Supported types are:
     """
 
-    SingleLabelClassification = "SingleLabelClassification"
-    ObjectDetection = "ObjectDetection"
+    SINGLE_LABEL_CLASSIFICATION = "SingleLabelClassification"
+    OBJECT_DETECTION = "ObjectDetection"
+    SPEECH_TO_TEXT = "SpeechToText"
 
 
 class DatasetMetadataType(str, Enum):
@@ -17,4 +18,6 @@ class DatasetMetadataType(str, Enum):
     Supported types are:
     """
 
-    HirundoCSV = "HirundoCSV"
+    HIRUNDO_CSV = "HirundoCSV"
+    COCO = "COCO"
+    YOLO = "YOLO"

hirundo/git.py

@@ -1,13 +1,16 @@
+import datetime
 import re
-from typing import Annotated, Union
+import typing
 
 import pydantic
 import requests
 from pydantic import BaseModel, field_validator
 from pydantic_core import Url
 
+from hirundo._constraints import RepoUrl
 from hirundo._env import API_HOST
 from hirundo._headers import get_auth_headers, json_headers
+from hirundo._http import raise_for_status_with_reason
 from hirundo._timeouts import MODIFY_TIMEOUT, READ_TIMEOUT
 from hirundo.logger import get_logger
 
@@ -30,14 +33,14 @@ class GitSSHAuthBase(BaseModel):
     """
     The SSH key for the Git repository
     """
-    ssh_password: Union[str, None]
+    ssh_password: typing.Optional[str]
     """
     The password for the SSH key for the Git repository.
     """
 
 
 class GitRepo(BaseModel):
-    id: Union[int, None] = None
+    id: typing.Optional[int] = None
     """
     The ID of the Git repository.
     """
@@ -46,25 +49,25 @@ class GitRepo(BaseModel):
     """
     A name to identify the Git repository in the Hirundo system.
     """
-    repository_url: Annotated[str, Url]
+    repository_url: typing.Union[str, RepoUrl]
     """
     The URL of the Git repository, it should start with `ssh://` or `https://` or be in the form `user@host:path`.
     If it is in the form `user@host:path`, it will be rewritten to `ssh://user@host:path`.
     """
-    organization_id: Union[int, None] = None
+    organization_id: typing.Optional[int] = None
     """
     The ID of the organization that the Git repository belongs to.
     If not provided, it will be assigned to your default organization.
     """
 
-    plain_auth: Union[GitPlainAuthBase, None] = pydantic.Field(
+    plain_auth: typing.Optional[GitPlainAuthBase] = pydantic.Field(
         default=None, examples=[None, {"username": "ben", "password": "password"}]
     )
     """
     The plain authentication details for the Git repository.
     Use this if using a special user with a username and password for authentication.
     """
-    ssh_auth: Union[GitSSHAuthBase, None] = pydantic.Field(
+    ssh_auth: typing.Optional[GitSSHAuthBase] = pydantic.Field(
         default=None,
         examples=[
             {
@@ -82,43 +85,92 @@ class GitRepo(BaseModel):
 
     @field_validator("repository_url", mode="before", check_fields=True)
     @classmethod
-    def check_valid_repository_url(cls, repository_url: str):
-        # Check if the URL already has a protocol
-        if not re.match(r"^[a-z]+://", repository_url):
-            # Check if the URL has the `@` and `:` pattern with a non-numeric section before the next slash
-            match = re.match(r"([^@]+@[^:]+):([^0-9/][^/]*)/(.+)", repository_url)
-            if match:
-                user_host = match.group(1)
-                path = match.group(2) + "/" + match.group(3)
-                rewritten_url = f"ssh://{user_host}/{path}"
-                logger.info("Modified Git repo to add SSH protocol", rewritten_url)
-                return rewritten_url
-        if not repository_url.startswith("ssh://") and not repository_url.startswith(
-            "https://"
-        ):
+    def check_valid_repository_url(cls, repository_url: typing.Union[str, RepoUrl]):
+        # Check if the URL has the `@` and `:` pattern with a non-numeric section before the next slash
+        match = re.match("([^@]+@[^:]+):([^0-9/][^/]*)/(.+)", str(repository_url))
+        if match:
+            user_host = match.group(1)
+            path = match.group(2) + "/" + match.group(3)
+            rewritten_url = Url(f"ssh://{user_host}/{path}")
+            # Check if the URL already has a protocol
+            url_scheme = rewritten_url.scheme
+            logger.info(
+                "Modified Git repo to replace %s@%s:%s/%s with %s",
+                url_scheme,
+                match.group(1),
+                match.group(2),
+                match.group(3),
+                rewritten_url,
+            )
+            return rewritten_url
+        if not str(repository_url).startswith("ssh://") and not str(
+            repository_url
+        ).startswith("https://"):
             raise ValueError("Repository URL must start with 'ssh://' or 'https://'")
+        if not isinstance(repository_url, Url):
+            repository_url = Url(repository_url)
         return repository_url
 
-    def create(self):
+    def create(self, replace_if_exists: bool = False) -> int:
         """
         Create a Git repository in the Hirundo system.
+
+        Args:
+            replace_if_exists: If a Git repository with the same name already exists, replace it.
         """
         git_repo = requests.post(
             f"{API_HOST}/git-repo/",
-            json=self.model_dump(),
+            json={
+                **self.model_dump(mode="json"),
+                "replace_if_exists": replace_if_exists,
+            },
             headers={
                 **json_headers,
                 **get_auth_headers(),
             },
             timeout=MODIFY_TIMEOUT,
         )
-        git_repo.raise_for_status()
+        raise_for_status_with_reason(git_repo)
         git_repo_id = git_repo.json()["id"]
         self.id = git_repo_id
         return git_repo_id
 
     @staticmethod
-    def list():
+    def get_by_id(git_repo_id: int) -> "GitRepoOut":
+        """
+        Retrieves a `GitRepo` instance from the server by its ID
+
+        Args:
+            git_repo_id: The ID of the `GitRepo` to retrieve
+        """
+        git_repo = requests.get(
+            f"{API_HOST}/git-repo/{git_repo_id}",
+            headers=get_auth_headers(),
+            timeout=READ_TIMEOUT,
+        )
+        raise_for_status_with_reason(git_repo)
+        return GitRepoOut(**git_repo.json())
+
+    @staticmethod
+    def get_by_name(
+        name: str,
+    ) -> "GitRepoOut":
+        """
+        Retrieves a `GitRepo` instance from the server by its name
+
+        Args:
+            name: The name of the `GitRepo` to retrieve
+        """
+        git_repo = requests.get(
+            f"{API_HOST}/git-repo/by-name/{name}",
+            headers=get_auth_headers(),
+            timeout=READ_TIMEOUT,
+        )
+        raise_for_status_with_reason(git_repo)
+        return GitRepoOut(**git_repo.json())
+
+    @staticmethod
+    def list() -> list["GitRepoOut"]:
         """
         List all Git repositories in the Hirundo system.
         """
@@ -129,8 +181,14 @@ class GitRepo(BaseModel):
             },
             timeout=READ_TIMEOUT,
         )
-        git_repos.raise_for_status()
-        return git_repos.json()
+        raise_for_status_with_reason(git_repos)
+        git_repo_json = git_repos.json()
+        return [
+            GitRepoOut(
+                **git_repo,
+            )
+            for git_repo in git_repo_json
+        ]
 
     @staticmethod
     def delete_by_id(git_repo_id: int):
@@ -147,7 +205,7 @@ class GitRepo(BaseModel):
             },
             timeout=MODIFY_TIMEOUT,
         )
-        git_repo.raise_for_status()
+        raise_for_status_with_reason(git_repo)
 
     def delete(self):
         """
@@ -156,3 +214,12 @@ class GitRepo(BaseModel):
         if not self.id:
             raise ValueError("No GitRepo has been created")
         GitRepo.delete_by_id(self.id)
+
+
+class GitRepoOut(BaseModel):
+    id: int
+    name: str
+    repository_url: RepoUrl
+
+    created_at: datetime.datetime
+    updated_at: datetime.datetime

hirundo/logger.py

@@ -1,8 +1,10 @@
 import logging
+import os
 
 
 def get_logger(name: str) -> logging.Logger:
     logger = logging.getLogger(name)
-    logger.setLevel(logging.INFO)
+    log_level = os.getenv("LOG_LEVEL")
+    logger.setLevel(log_level if log_level else logging.INFO)
     logger.addHandler(logging.StreamHandler())
     return logger