logdetective 0.9.0__tar.gz → 0.10.0__tar.gz

{logdetective-0.9.0 → logdetective-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: logdetective
-Version: 0.9.0
+Version: 0.10.0
 Summary: Log using LLM AI to search for build/test failures and provide ideas for fixing these.
 License: Apache-2.0
 Author: Jiri Podivin
@@ -21,6 +21,7 @@ Classifier: Topic :: Software Development :: Debuggers
 Provides-Extra: server
 Provides-Extra: server-testing
 Requires-Dist: aiohttp (>=3.7.4)
+Requires-Dist: aiolimiter (>=1.0.0,<2.0.0) ; extra == "server"
 Requires-Dist: alembic (>=1.13.3,<2.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)
@@ -60,7 +61,7 @@ Installation
 
 **From Pypi repository**
 
-The logdetective project is published on the the the the the [Pypi repository](https://pypi.org/project/logdetective/). The `pip` tool can be used for installation.
+The logdetective project is published on the [Pypi repository](https://pypi.org/project/logdetective/). The `pip` tool can be used for installation.
 
 First, ensure that the necessary dependencies for the `llama-cpp-python` project are installed. For Fedora, install `gcc-c++`:
 

{logdetective-0.9.0 → logdetective-0.10.0}/README.md

@@ -18,7 +18,7 @@ Installation
 
 **From Pypi repository**
 
-The logdetective project is published on the the the the the [Pypi repository](https://pypi.org/project/logdetective/). The `pip` tool can be used for installation.
+The logdetective project is published on the [Pypi repository](https://pypi.org/project/logdetective/). The `pip` tool can be used for installation.
 
 First, ensure that the necessary dependencies for the `llama-cpp-python` project are installed. For Fedora, install `gcc-c++`:
 

{logdetective-0.9.0 → logdetective-0.10.0}/logdetective/constants.py

@@ -72,3 +72,7 @@ Analysis:
 SNIPPET_DELIMITER = "================"
 
 DEFAULT_TEMPERATURE = 0.8
+
+# Tuning for LLM-as-a-Service
+LLM_DEFAULT_MAX_QUEUE_SIZE = 50
+LLM_DEFAULT_REQUESTS_PER_MINUTE = 60

{logdetective-0.9.0/logdetective/server → logdetective-0.10.0/logdetective}/remote_log.py

@@ -1,24 +1,17 @@
-import io
 import logging
-from typing import Union
 from urllib.parse import urlparse
 
 import aiohttp
-
-from logdetective.server.compressors import TextCompressor
-
+from fastapi import HTTPException
 
 LOG = logging.getLogger("logdetective")
 
 
 class RemoteLog:
     """
-    Handles retrieval and compression of remote log files.
+    Handles retrieval of remote log files.
     """
 
-    LOG_FILE_NAME = "log.txt"
-    COMPRESSOR = TextCompressor()
-
     def __init__(self, url: str, http_session: aiohttp.ClientSession):
         """
         Initialize with a remote log URL and HTTP session.
@@ -40,39 +33,6 @@ class RemoteLog:
         """Content of the url."""
         return await self.get_url_content()
 
-    @classmethod
-    def zip_text(cls, text: str) -> bytes:
-        """
-        Compress the given text.
-
-        Returns:
-            bytes: Compressed text
-        """
-        return cls.COMPRESSOR.zip({cls.LOG_FILE_NAME: text})
-
-    async def zip_content(self) -> bytes:
-        """
-        Compress the content of the remote log.
-
-        Returns:
-            bytes: Compressed log content
-        """
-        content_text = await self.content
-        return self.zip_text(content_text)
-
-    @classmethod
-    def unzip(cls, zip_data: Union[bytes, io.BytesIO]) -> str:
-        """
-        Uncompress the zipped content of the remote log.
-
-        Args:
-            zip_data: Compressed data as bytes or BytesIO
-
-        Returns:
-            str: The decompressed log content
-        """
-        return cls.COMPRESSOR.unzip(zip_data)[cls.LOG_FILE_NAME]
-
     def validate_url(self) -> bool:
         """Validate incoming URL to be at least somewhat sensible for log files
         Only http and https protocols permitted. No result, params or query fields allowed.
@@ -104,6 +64,6 @@ class RemoteLog:
         try:
             return await self.get_url_content()
         except RuntimeError as ex:
-            raise aiohttp.HTTPException(
+            raise HTTPException(
                 status_code=400, detail=f"We couldn't obtain the logs: {ex}"
             ) from ex

{logdetective-0.9.0 → logdetective-0.10.0}/logdetective/server/compressors.py

@@ -1,8 +1,8 @@
 import io
-import logging
 import zipfile
 
 from typing import Union, Dict
+from logdetective.remote_log import RemoteLog
 from logdetective.server.models import (
     StagedResponse,
     Response,
@@ -11,9 +11,6 @@ from logdetective.server.models import (
 )
 
 
-LOG = logging.getLogger("logdetective")
-
-
 class TextCompressor:
     """
     Encapsulates one or more texts in one or more files with the specified names
@@ -63,6 +60,54 @@ class TextCompressor:
         return content
 
 
+class RemoteLogCompressor:
+    """
+    Handles compression of remote log files.
+    """
+
+    LOG_FILE_NAME = "log.txt"
+    COMPRESSOR = TextCompressor()
+
+    def __init__(self, remote_log: RemoteLog):
+        """
+        Initialize with a RemoteLog object.
+        """
+        self._remote_log = remote_log
+
+    @classmethod
+    def zip_text(cls, text: str) -> bytes:
+        """
+        Compress the given text.
+
+        Returns:
+            bytes: Compressed text
+        """
+        return cls.COMPRESSOR.zip({cls.LOG_FILE_NAME: text})
+
+    async def zip_content(self) -> bytes:
+        """
+        Compress the content of the remote log.
+
+        Returns:
+            bytes: Compressed log content
+        """
+        content_text = await self._remote_log.content
+        return self.zip_text(content_text)
+
+    @classmethod
+    def unzip(cls, zip_data: Union[bytes, io.BytesIO]) -> str:
+        """
+        Uncompress the zipped content of the remote log.
+
+        Args:
+            zip_data: Compressed data as bytes or BytesIO
+
+        Returns:
+            str: The decompressed log content
+        """
+        return cls.COMPRESSOR.unzip(zip_data)[cls.LOG_FILE_NAME]
+
+
 class LLMResponseCompressor:
     """
     Handles compression and decompression of LLM responses.

logdetective-0.9.0/logdetective/server/utils.py → logdetective-0.10.0/logdetective/server/config.py

@@ -1,18 +1,8 @@
+import os
 import logging
 import yaml
-from logdetective.constants import SNIPPET_DELIMITER
-from logdetective.server.models import Config, AnalyzedSnippet
-
-
-def format_analyzed_snippets(snippets: list[AnalyzedSnippet]) -> str:
-    """Format snippets for submission into staged prompt."""
-    summary = f"\n{SNIPPET_DELIMITER}\n".join(
-        [
-            f"[{e.text}] at line [{e.line_number}]: [{e.explanation.text}]"
-            for e in snippets
-        ]
-    )
-    return summary
+from logdetective.utils import load_prompts
+from logdetective.server.models import Config
 
 
 def load_server_config(path: str | None) -> Config:
@@ -57,3 +47,12 @@ def get_log(config: Config):
 
     log.initialized = True
     return log
+
+
+SERVER_CONFIG_PATH = os.environ.get("LOGDETECTIVE_SERVER_CONF", None)
+SERVER_PROMPT_PATH = os.environ.get("LOGDETECTIVE_PROMPTS", None)
+
+SERVER_CONFIG = load_server_config(SERVER_CONFIG_PATH)
+PROMPT_CONFIG = load_prompts(SERVER_PROMPT_PATH)
+
+LOG = get_log(SERVER_CONFIG)

{logdetective-0.9.0 → logdetective-0.10.0}/logdetective/server/database/models/merge_request_jobs.py

@@ -1,6 +1,6 @@
 import enum
 import datetime
-from typing import Optional
+from typing import Optional, List
 
 import backoff
 
@@ -131,6 +131,24 @@ class GitlabMergeRequestJobs(Base):
             )
             return mr
 
+    @classmethod
+    def get_by_mr_iid(
+        cls, forge: Forge, project_id: int, mr_iid
+    ) -> Optional["GitlabMergeRequestJobs"]:
+        """Get all the mr jobs saved for the specified mr iid and project id."""
+        with transaction(commit=False) as session:
+            comments = (
+                session.query(cls)
+                .filter(
+                    GitlabMergeRequestJobs.forge == forge,
+                    GitlabMergeRequestJobs.project_id == project_id,
+                    GitlabMergeRequestJobs.mr_iid == mr_iid,
+                )
+                .all()
+            )
+
+            return comments
+
     @classmethod
     def get_or_create(
         cls,
@@ -170,12 +188,7 @@ class Comments(Base):
         index=True,
         comment="The associated merge request job (db) id",
     )
-    forge = Column(
-        Enum(Forge),
-        nullable=False,
-        index=True,
-        comment="The forge name"
-    )
+    forge = Column(Enum(Forge), nullable=False, index=True, comment="The forge name")
     comment_id = Column(
         String(50),  # e.g. 'd5a3ff139356ce33e37e73add446f16869741b50'
         nullable=False,
@@ -362,6 +375,36 @@ class Comments(Base):
             comment = GitlabMergeRequestJobs.get_by_id(id_)
         return comment
 
+    @classmethod
+    def get_since(cls, time: datetime.datetime) -> Optional["Comments"]:
+        """Get all the comments created after the given time."""
+        with transaction(commit=False) as session:
+            comments = (
+                session.query(cls)
+                .filter(
+                    Comments.created_at > time,
+                )
+                .all()
+            )
+
+            return comments
+
+    @classmethod
+    def get_by_mr_job(
+        cls, merge_request_job: GitlabMergeRequestJobs
+    ) -> Optional["Comments"]:
+        """Get the comment added for the specified merge request's job."""
+        with transaction(commit=False) as session:
+            comments = (
+                session.query(cls)
+                .filter(
+                    Comments.merge_request_job == merge_request_job,
+                )
+                .first()  # just one
+            )
+
+            return comments
+
 
 class Reactions(Base):
     """Store and count reactions received for
@@ -513,3 +556,32 @@ class Reactions(Base):
             )
 
             return reaction
+
+    @classmethod
+    @backoff.on_exception(backoff.expo, OperationalError, max_tries=DB_MAX_RETRIES)
+    def delete(  # pylint: disable=too-many-arguments disable=too-many-positional-arguments
+        cls,
+        forge: Forge,
+        project_id: int,
+        mr_iid: int,
+        job_id: int,
+        comment_id: str,
+        reaction_types: List[str],
+    ) -> None:
+        """Remove rows with given reaction types
+
+        Args:
+          forge: forge name
+          project_id: forge project id
+          mr_iid: merge request forge iid
+          job_id: forge job id
+          comment_id: forge comment id
+          reaction_type: a str iterable, ex. ['thumbsup', 'thumbsdown']
+        """
+        for reaction_type in reaction_types:
+            reaction = cls.get_reaction_by_type(
+                forge, project_id, mr_iid, job_id, comment_id, reaction_type
+            )
+            with transaction(commit=True) as session:
+                session.delete(reaction)
+                session.flush()

logdetective-0.10.0/logdetective/server/emoji.py

@@ -0,0 +1,104 @@
+import asyncio
+
+from typing import List
+from collections import Counter
+
+import gitlab
+
+from logdetective.server.models import TimePeriod
+from logdetective.server.database.models import (
+    Comments,
+    Reactions,
+    GitlabMergeRequestJobs,
+)
+
+
+async def collect_emojis(gitlab_conn: gitlab.Gitlab, period: TimePeriod):
+    """
+    Collect emoji feedback from logdetective comments saved in database.
+    Check only comments created in the last given period of time.
+    """
+    comments = Comments.get_since(period.get_period_start_time())
+    comments_for_gitlab_connection = [
+        comment for comment in comments if comment.forge == gitlab_conn.url
+    ]
+    await collect_emojis_in_comments(comments_for_gitlab_connection, gitlab_conn)
+
+
+async def collect_emojis_for_mr(
+    project_id: int, mr_iid: int, gitlab_conn: gitlab.Gitlab
+):
+    """
+    Collect emoji feedback from logdetective comments in the specified MR.
+    """
+    mr_jobs = GitlabMergeRequestJobs.get_by_mr_iid(gitlab_conn.url, project_id, mr_iid)
+    comments = [Comments.get_by_mr_job(mr_job) for mr_job in mr_jobs]
+    await collect_emojis_in_comments(comments, gitlab_conn)
+
+
+async def collect_emojis_in_comments(  # pylint: disable=too-many-locals
+    comments: List[Comments], gitlab_conn: gitlab.Gitlab
+):
+    """
+    Collect emoji feedback from specified logdetective comments.
+    """
+    projects = {}
+    mrs = {}
+    for comment in comments:
+        mr_job_db = GitlabMergeRequestJobs.get_by_id(comment.merge_request_job_id)
+        if mr_job_db.id not in projects:
+            projects[mr_job_db.id] = project = await asyncio.to_thread(
+                gitlab_conn.projects.get, mr_job_db.project_id
+            )
+        else:
+            project = projects[mr_job_db.id]
+        mr_iid = mr_job_db.mr_iid
+        if mr_iid not in mrs:
+            mrs[mr_iid] = mr = await asyncio.to_thread(
+                project.mergerequests.get, mr_iid
+            )
+        else:
+            mr = mrs[mr_iid]
+
+        discussion = mr.discussions.get(comment.comment_id)
+
+        # Get the ID of the first note
+        note_id = discussion.attributes["notes"][0]["id"]
+        note = mr.notes.get(note_id)
+
+        emoji_counts = Counter(emoji.name for emoji in note.awardemojis.list())
+
+        # keep track of not updated reactions
+        # because we need to remove them
+        old_emojis = [
+            reaction.reaction_type
+            for reaction in Reactions.get_all_reactions(
+                comment.forge,
+                mr_job_db.project_id,
+                mr_job_db.mr_iid,
+                mr_job_db.job_id,
+                comment.comment_id,
+            )
+        ]
+        for key, value in emoji_counts.items():
+            Reactions.create_or_update(
+                comment.forge,
+                mr_job_db.project_id,
+                mr_job_db.mr_iid,
+                mr_job_db.job_id,
+                comment.comment_id,
+                key,
+                value,
+            )
+            if key in old_emojis:
+                old_emojis.remove(key)
+
+        # not updated reactions has been removed, drop them
+        Reactions.delete(
+            comment.forge,
+            mr_job_db.project_id,
+            mr_job_db.mr_iid,
+            mr_job_db.job_id,
+            comment.comment_id,
+            old_emojis,
+        )