commit post catastrophe

Author: NicolasIRAGNE

src/gitingest/entrypoint.py

@@ -15,6 +15,7 @@
 from gitingest.clone import clone_repo
 from gitingest.config import MAX_FILE_SIZE
 from gitingest.ingestion import ingest_query
+from gitingest.output_formatter import generate_digest
 from gitingest.query_parser import parse_local_dir_path, parse_remote_repo
 from gitingest.utils.auth import resolve_token
 from gitingest.utils.compat_func import removesuffix
@@ -51,7 +52,7 @@ async def ingest_async(
     This function analyzes a source (URL or local path), clones the corresponding repository (if applicable),
     and processes its files according to the specified query parameters. It returns a single digest string.
 
-    The output is generated lazily using a Context object and its .generate_digest() method.
+    The output is generated lazily using a Context object and the generate_digest() function.
 
     Parameters
     ----------
@@ -142,7 +143,7 @@ async def ingest_async(
         if output:
             logger.debug("Writing output to file", extra={"output_path": output})
         context = ingest_query(query)
-        digest = context.generate_digest()
+        digest = generate_digest(context)
         await _write_output(digest, content=None, target=output)
         logger.info("Ingestion completed successfully")
         return digest
@@ -166,7 +167,7 @@ def ingest(
     This function analyzes a source (URL or local path), clones the corresponding repository (if applicable),
     and processes its files according to the specified query parameters. It returns a single digest string.
 
-    The output is generated lazily using a Context object and its .generate_digest() method.
+    The output is generated lazily using a Context object and the generate_digest() function.
 
     Parameters
     ----------
@@ -204,7 +205,7 @@ def ingest(
     ``ingest_async`` : The asynchronous version of this function.
 
     """
-    context = asyncio.run(ingest_async(
+    digest = asyncio.run(ingest_async(
         source,
         max_file_size=max_file_size,
         include_patterns=include_patterns,
@@ -216,7 +217,7 @@ def ingest(
         token=token,
         output=output,
     ))
-    return context.generate_digest()
+    return digest
 
 
 def _override_branch_and_tag(query: IngestionQuery, branch: str | None, tag: str | None) -> None:

src/gitingest/ingestion.py

@@ -33,7 +33,7 @@ def ingest_query(query: IngestionQuery) -> Context:
     Returns
     -------
     Context
-        A Context object representing the ingested file system nodes. Call .generate_digest() to get the summary, directory structure, and file contents.
+        A Context object representing the ingested file system nodes. Use generate_digest(context) to get the summary, directory structure, and file contents.
 
     Raises
     ------

src/gitingest/output_formatter.py

@@ -12,7 +12,7 @@
 from gitingest.utils.compat_func import readlink
 from functools import singledispatchmethod
 from gitingest.schemas import Source, FileSystemFile, FileSystemDirectory, FileSystemSymlink, FileSystemTextFile
-from gitingest.schemas.filesystem import SEPARATOR, FileSystemNodeType
+from gitingest.schemas.filesystem import SEPARATOR, FileSystemNodeType, CONTEXT_HEADER, CONTEXT_FOOTER
 from gitingest.utils.logging_config import get_logger
 from jinja2 import Environment, BaseLoader
 
@@ -291,3 +291,27 @@ def _(node: FileSystemFile, query):
 """
             file_template = self.env.from_string(template)
             return file_template.render(SEPARATOR=SEPARATOR, node=node, query=query, formatter=self)
+
+
+def generate_digest(context) -> str:
+    """Generate a digest from a Context object.
+    
+    Parameters
+    ----------
+    context : Context
+        The context object containing nodes, formatter, and query.
+        
+    Returns
+    -------
+    str
+        The formatted digest string with header, content, and footer.
+    """
+    if context.query.user_name and context.query.repo_name:
+        context_header = CONTEXT_HEADER.format(f"/{context.query.user_name}/{context.query.repo_name}")
+    else:
+        context_header = CONTEXT_HEADER.format("")
+    context_footer = CONTEXT_FOOTER
+    formatted = []
+    for node in context.nodes:
+        formatted.append(context.formatter.format(node, context.query))
+    return context_header + "\n".join(formatted) + context_footer

src/gitingest/schemas/filesystem.py

@@ -129,31 +129,22 @@ def _(self: 'FileSystemSymlink'):
 
 
 class Context:
-    """Context for holding a list of Source objects and generating a digest on demand using a Formatter.
+    """Context for holding a list of Source objects that can be formatted using a Formatter.
 
     Attributes
     ----------
     nodes : list[Source]
-        The list of source objects to generate a digest for.
+        The list of source objects to format.
     formatter : Formatter
         The formatter to use for formatting sources.
     query : IngestionQuery
         The query context.
     """
-    nodes: list[Source]
-    formatter: Formatter
-    query: IngestionQuery
-
-    def generate_digest(self) -> str:
-        if self.query.user_name and self.query.repo_name:
-            context_header = CONTEXT_HEADER.format(f"/{self.query.user_name}/{self.query.repo_name}")
-        else:
-            context_header = CONTEXT_HEADER.format("")
-        context_footer = CONTEXT_FOOTER
-        formatted = []
-        for node in self.nodes:
-            formatted.append(self.formatter.format(node, self.query))
-        return context_header + "\n".join(formatted) + context_footer
+    
+    def __init__(self, nodes: list[Source], formatter: Formatter, query: IngestionQuery):
+        self.nodes = nodes
+        self.formatter = formatter
+        self.query = query
 
     @property
     def summary(self):

src/server/query_processor.py

@@ -7,6 +7,7 @@
 
 from gitingest.clone import clone_repo
 from gitingest.ingestion import ingest_query
+from gitingest.output_formatter import generate_digest
 from gitingest.query_parser import parse_remote_repo
 from gitingest.utils.git_utils import resolve_commit, validate_github_token
 from gitingest.utils.logging_config import get_logger
@@ -289,7 +290,7 @@ async def process_query(
 
     try:
         context = ingest_query(query)
-        digest = context.generate_digest()
+        digest = generate_digest(context)
 
         # Store digest based on S3 configuration
         if is_s3_enabled():
@@ -338,7 +339,7 @@ async def process_query(
         summary="",
         digest_url=digest_url,
         tree="",
-        content=content,
+        content=digest,
         default_max_file_size=max_file_size,
         pattern_type=pattern_type,
         pattern=pattern,