logdetective 2.9.0__tar.gz → 2.11.0__tar.gz

{logdetective-2.9.0 → logdetective-2.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: logdetective
-Version: 2.9.0
+Version: 2.11.0
 Summary: Log using LLM AI to search for build/test failures and provide ideas for fixing these.
 License: Apache-2.0
 License-File: LICENSE
@@ -28,12 +28,12 @@ Requires-Dist: aiolimiter (>=1.0.0,<2.0.0) ; extra == "server"
 Requires-Dist: aioresponses (>=0.7.8,<0.8.0) ; extra == "testing"
 Requires-Dist: alembic (>=1.13.3,<2.0.0) ; extra == "server" or extra == "server-testing"
 Requires-Dist: asciidoc[testing] (>=10.2.1,<11.0.0) ; extra == "testing"
-Requires-Dist: asyncpg (>=0.30.0,<0.31.0) ; extra == "server" or extra == "server-testing"
+Requires-Dist: asyncpg (>=0.30.0,<1.0.0) ; extra == "server" or extra == "server-testing"
 Requires-Dist: backoff (==2.2.1) ; extra == "server" or extra == "server-testing"
 Requires-Dist: drain3 (>=0.9.11,<0.10.0)
 Requires-Dist: fastapi (>=0.111.1,<1.0.0) ; extra == "server" or extra == "server-testing"
 Requires-Dist: flexmock (>=0.12.2,<0.13.0) ; extra == "testing"
-Requires-Dist: huggingface-hub (>0.23.2,<0.35.0)
+Requires-Dist: huggingface-hub (>=0.23.0,<1.4.0)
 Requires-Dist: koji (>=1.35.0,<2.0.0) ; extra == "server" or extra == "server-testing"
 Requires-Dist: llama-cpp-python (>0.2.56,!=0.2.86,<1.0.0)
 Requires-Dist: matplotlib (>=3.8.4,<4.0.0) ; extra == "server" or extra == "server-testing"

{logdetective-2.9.0 → logdetective-2.11.0}/logdetective/server/emoji.py

@@ -1,6 +1,6 @@
 import asyncio
 
-from typing import List, Callable
+from typing import List
 from collections import Counter
 
 import gitlab
@@ -49,25 +49,6 @@ async def collect_emojis_for_mr(
     await collect_emojis_in_comments(comments, gitlab_conn)
 
 
-async def _handle_gitlab_operation(func: Callable, *args):
-    """
-    It handles errors for the specified GitLab operation.
-    After executing it in a separate thread.
-    """
-    try:
-        return await asyncio.to_thread(func, *args)
-    except (gitlab.GitlabError, gitlab.GitlabGetError) as e:
-        log_msg = f"Error during GitLab operation {func}{args}: {e}"
-        if "Not Found" in str(e):
-            LOG.error(log_msg)
-        else:
-            LOG.exception(log_msg)
-    except Exception as e:  # pylint: disable=broad-exception-caught
-        LOG.exception(
-            "Unexpected error during GitLab operation %s(%s): %s", func, args, e
-        )
-
-
 async def collect_emojis_in_comments(  # pylint: disable=too-many-locals
     comments: List[Comments], gitlab_conn: gitlab.Gitlab
 ):
@@ -80,37 +61,54 @@ async def collect_emojis_in_comments(  # pylint: disable=too-many-locals
         mr_job_db = await GitlabMergeRequestJobs.get_by_id(comment.merge_request_job_id)
         if not mr_job_db:
             continue
-        if mr_job_db.id not in projects:
-            project = await _handle_gitlab_operation(
-                gitlab_conn.projects.get, mr_job_db.project_id
-            )
-            if not project:
-                continue
-            projects[mr_job_db.id] = project
-        else:
-            project = projects[mr_job_db.id]
-        merge_request_iid = mr_job_db.mr_iid
-        if merge_request_iid not in merge_requests:
-            merge_request = await _handle_gitlab_operation(
-                project.mergerequests.get, merge_request_iid
+        try:
+            if mr_job_db.id not in projects:
+                project = await asyncio.to_thread(
+                    gitlab_conn.projects.get, mr_job_db.project_id
+                )
+
+                projects[mr_job_db.id] = project
+            else:
+                project = projects[mr_job_db.id]
+            merge_request_iid = mr_job_db.mr_iid
+            if merge_request_iid not in merge_requests:
+                merge_request = await asyncio.to_thread(
+                    project.mergerequests.get, merge_request_iid
+                )
+
+                merge_requests[merge_request_iid] = merge_request
+            else:
+                merge_request = merge_requests[merge_request_iid]
+
+            discussion = await asyncio.to_thread(
+                merge_request.discussions.get, comment.comment_id
             )
-            if not merge_request:
-                continue
-            merge_requests[merge_request_iid] = merge_request
-        else:
-            merge_request = merge_requests[merge_request_iid]
 
-        discussion = await _handle_gitlab_operation(
-            merge_request.discussions.get, comment.comment_id
-        )
-        if not discussion:
-            continue
+            # Get the ID of the first note
+            if "notes" not in discussion.attributes or len(discussion.attributes["notes"]) == 0:
+                LOG.warning(
+                    "No notes were found in comment %s in merge request %d",
+                    comment.comment_id,
+                    merge_request_iid,
+                )
+                continue
 
-        # Get the ID of the first note
-        note_id = discussion.attributes["notes"][0]["id"]
-        note = await _handle_gitlab_operation(merge_request.notes.get, note_id)
-        if not note:
-            continue
+            note_id = discussion.attributes["notes"][0]["id"]
+            note = await asyncio.to_thread(merge_request.notes.get, note_id)
+
+        # Log warning with full stack trace, in case we can't find the right
+        # discussion, merge request or project.
+        # All of these objects can be lost, and we shouldn't treat as an error.
+        # Other exceptions are raised.
+        except gitlab.GitlabError as e:
+            if e.response_code == 404:
+                LOG.warning(
+                    "Couldn't retrieve emoji counts for comment %s due to GitlabError",
+                    comment.comment_id, exc_info=True)
+                continue
+            LOG.error("Error encountered while processing emoji counts for GitLab comment %s",
+                      comment.comment_id, exc_info=True)
+            raise
 
         emoji_counts = Counter(emoji.name for emoji in note.awardemojis.list())
 

{logdetective-2.9.0 → logdetective-2.11.0}/logdetective/server/models.py

@@ -10,6 +10,7 @@ from pydantic import (
     field_validator,
     NonNegativeFloat,
     HttpUrl,
+    PrivateAttr,
 )
 
 import aiohttp
@@ -183,8 +184,8 @@ class InferenceConfig(BaseModel):  # pylint: disable=too-many-instance-attribute
     user_role: str = USER_ROLE_DEFAULT
     system_role: str = SYSTEM_ROLE_DEFAULT
     llm_api_timeout: float = 15.0
-    _http_session: aiohttp.ClientSession = None
-    _limiter: AsyncLimiter = AsyncLimiter(LLM_DEFAULT_REQUESTS_PER_MINUTE)
+    _limiter: AsyncLimiter = PrivateAttr(
+        default_factory=lambda: AsyncLimiter(LLM_DEFAULT_REQUESTS_PER_MINUTE))
 
     def __init__(self, data: Optional[dict] = None):
         super().__init__()
@@ -207,40 +208,6 @@ class InferenceConfig(BaseModel):  # pylint: disable=too-many-instance-attribute
         self.llm_api_timeout = data.get("llm_api_timeout", 15.0)
         self._limiter = AsyncLimiter(self._requests_per_minute)
 
-    def __del__(self):
-        # Close connection when this object is destroyed
-        if self._http_session:
-            try:
-                loop = asyncio.get_running_loop()
-                loop.create_task(self._http_session.close())
-            except RuntimeError:
-                # No loop running, so create one to close the session
-                loop = asyncio.new_event_loop()
-                loop.run_until_complete(self._http_session.close())
-                loop.close()
-            except Exception:  # pylint: disable=broad-exception-caught
-                # We should only get here if we're shutting down, so we don't
-                # really care if the close() completes cleanly.
-                pass
-
-    def get_http_session(self):
-        """Return the internal HTTP session so it can be used to contect the
-        LLM server. May be used as a context manager."""
-
-        # Create the session on the first attempt. We need to do this "lazily"
-        # because it needs to happen once the event loop is running, even
-        # though the initialization itself is synchronous.
-        if not self._http_session:
-            self._http_session = aiohttp.ClientSession(
-                base_url=self.url,
-                timeout=aiohttp.ClientTimeout(
-                    total=self.http_timeout,
-                    connect=3.07,
-                ),
-            )
-
-        return self._http_session
-
     def get_limiter(self):
         """Return the limiter object so it can be used as a context manager"""
         return self._limiter
@@ -254,7 +221,7 @@ class ExtractorConfig(BaseModel):
     max_snippet_len: int = 2000
     csgrep: bool = False
 
-    _extractors: List[Extractor] = []
+    _extractors: List[Extractor] = PrivateAttr(default_factory=list)
 
     def _setup_extractors(self):
         """Initialize extractors with common settings."""
@@ -322,8 +289,8 @@ class GitLabInstanceConfig(BaseModel):  # pylint: disable=too-many-instance-attr
     webhook_secrets: Optional[List[str]] = None
 
     timeout: float = 5.0
-    _conn: Gitlab = None
-    _http_session: aiohttp.ClientSession = None
+    _conn: Gitlab | None = PrivateAttr(default=None)
+    _http_session: aiohttp.ClientSession | None = PrivateAttr(default=None)
 
     # Maximum size of artifacts.zip in MiB. (default: 300 MiB)
     max_artifact_size: int = 300 * 1024 * 1024
@@ -409,8 +376,8 @@ class KojiInstanceConfig(BaseModel):
     xmlrpc_url: str = ""
     tokens: List[str] = []
 
-    _conn: Optional[koji.ClientSession] = None
-    _callbacks: defaultdict[int, set[str]] = defaultdict(set)
+    _conn: Optional[koji.ClientSession] = PrivateAttr(default=None)
+    _callbacks: defaultdict[int, set[str]] = PrivateAttr(default_factory=lambda: defaultdict(set))
 
     def __init__(self, name: str, data: Optional[dict] = None):
         super().__init__()

{logdetective-2.9.0 → logdetective-2.11.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "logdetective"
-version = "2.9.0"
+version = "2.11.0"
 description = "Log using LLM AI to search for build/test failures and provide ideas for fixing these."
 authors = ["Jiri Podivin <jpodivin@gmail.com>"]
 license = "Apache-2.0"
@@ -34,7 +34,7 @@ issues = "https://github.com/fedora-copr/logdetective/issues"
 python = "^3.11"
 llama-cpp-python = ">0.2.56,!=0.2.86,<1.0.0"
 drain3 = ">=0.9.11,<0.10.0"
-huggingface-hub = ">0.23.2,<0.35.0"
+huggingface-hub = ">=0.23.0,<1.4.0"
 # rawhide has numpy 2, F40 and F41 are still on 1.26
 # we need to support both versions
 numpy = ">=1.26.0"
@@ -59,7 +59,7 @@ pytest-mock = {version = ">=3.14.1,<4.0.0", optional = true}
 flexmock = {version = ">=0.12.2,<0.13.0", optional = true}
 pytest = {version = ">=8.4.1,<9.0.0", optional = true}
 pytest-cov = {version = "^7.0.0", extras = ["testing"], optional = true}
-asyncpg = {version = "^0.30.0", optional = true}
+asyncpg = {version = ">=0.30.0,<1.0.0", optional = true}
 asciidoc = {version = "^10.2.1", optional = true, extras = ["testing"]}
 
 [tool.poetry.extras]