diff --git a/common/requirements.txt b/common/requirements.txt index 562c2f6..d5a2d5b 100644 --- a/common/requirements.txt +++ b/common/requirements.txt @@ -110,7 +110,8 @@ packaging==24.2 pandas==2.2.3 #pathtools==0.1.2 pillow==11.2.1 -PyMuPDF==1.26.4 +PyMuPDF==1.26.6 +pymupdf4llm==0.2.0 platformdirs==4.3.8 pluggy==1.6.0 prometheus_client==0.22.1 diff --git a/common/utils/graph_locks.py b/common/utils/graph_locks.py new file mode 100644 index 0000000..9d09b5b --- /dev/null +++ b/common/utils/graph_locks.py @@ -0,0 +1,151 @@ +""" +Graph-level locking mechanism to prevent concurrent operations on the same graph. +Uses threading.Lock for sync operations and asyncio.Lock for async rebuild operations. +""" +import asyncio +import threading +import logging +from typing import Dict, Optional +from fastapi import HTTPException + +logger = logging.getLogger(__name__) + +# Module-level lock management +_graph_locks: Dict[str, threading.Lock] = {} +_locks_dict_lock = threading.Lock() + +# Global rebuild lock (only one rebuild at a time across all graphs) +# Use asyncio.Lock for async operations +_rebuild_lock: Optional[asyncio.Lock] = None +_currently_rebuilding_graph: str = None +_rebuild_graph_lock = threading.Lock() # Protects _currently_rebuilding_graph + + +def _get_rebuild_lock() -> asyncio.Lock: + """Get or create the async rebuild lock.""" + global _rebuild_lock + if _rebuild_lock is None: + _rebuild_lock = asyncio.Lock() + return _rebuild_lock + + +def get_graph_lock(graphname: str) -> threading.Lock: + """Get or create a lock for a specific graph.""" + with _locks_dict_lock: + if graphname not in _graph_locks: + _graph_locks[graphname] = threading.Lock() + logger.debug(f"Created new lock for graph: {graphname}") + return _graph_locks[graphname] + + +def acquire_graph_lock(graphname: str, operation: str = "operation") -> bool: + """ + Try to acquire lock for a graph. Returns True if acquired, False if already locked. + + Args: + graphname: Name of the graph to lock + operation: Description of the operation (for logging) + """ + lock = get_graph_lock(graphname) + acquired = lock.acquire(blocking=False) + + if acquired: + logger.info(f"Lock acquired for graph '{graphname}' - {operation}") + else: + logger.warning(f"Lock already held for graph '{graphname}' - {operation} blocked") + + return acquired + + +def release_graph_lock(graphname: str, operation: str = "operation"): + """ + Release the lock for a graph. + + Args: + graphname: Name of the graph to unlock + operation: Description of the operation (for logging) + """ + lock = get_graph_lock(graphname) + if lock.locked(): + lock.release() + logger.info(f"Lock released for graph '{graphname}' - {operation} completed") + + +def raise_if_locked(graphname: str, operation: str = "operation"): + """ + Try to acquire lock or raise HTTPException with 409 Conflict status. + Used for FastAPI endpoints. + + Args: + graphname: Name of the graph to lock + operation: Description of the operation + + Raises: + HTTPException: 409 Conflict if lock is already held + """ + if not acquire_graph_lock(graphname, operation): + raise HTTPException( + status_code=409, + detail=f"Another operation is already in progress for graph '{graphname}'. Please wait and try again." + ) + +# ===================================================== +# Global Rebuild Lock Functions +# ===================================================== + +async def acquire_rebuild_lock(graphname: str) -> bool: + """ + Try to acquire the global rebuild lock (only one rebuild at a time across all graphs). + Returns True if acquired immediately, False if another rebuild is in progress. + Non-blocking operation - returns instantly. + + Args: + graphname: Name of the graph requesting rebuild + """ + global _currently_rebuilding_graph + + lock = _get_rebuild_lock() + + # Non-blocking check: return immediately if lock is busy + if lock.locked(): + logger.warning(f"Rebuild lock busy - another graph is rebuilding. Request from: {graphname}") + return False + + # Try to acquire the lock (should be instant since we checked it's not locked) + try: + await asyncio.wait_for(lock.acquire(), timeout=0.01) # 10ms safety timeout + with _rebuild_graph_lock: + _currently_rebuilding_graph = graphname + logger.info(f"Global rebuild lock acquired for graph: {graphname}") + return True + except asyncio.TimeoutError: + # Race condition: lock was acquired between check and acquire + logger.warning(f"Rebuild lock busy - another graph is rebuilding. Request from: {graphname}") + return False + + +def release_rebuild_lock(graphname: str): + """ + Release the global rebuild lock. + + Args: + graphname: Name of the graph releasing rebuild lock + """ + global _currently_rebuilding_graph + + lock = _get_rebuild_lock() + if lock.locked(): + with _rebuild_graph_lock: + _currently_rebuilding_graph = None + lock.release() + logger.info(f"Global rebuild lock released for graph: {graphname}") + + +def get_rebuilding_graph() -> str: + """ + Get the name of the graph currently being rebuilt. + Returns None if no rebuild is in progress. + """ + with _rebuild_graph_lock: + return _currently_rebuilding_graph + diff --git a/common/utils/image_data_extractor.py b/common/utils/image_data_extractor.py index bde9c97..1959e8c 100644 --- a/common/utils/image_data_extractor.py +++ b/common/utils/image_data_extractor.py @@ -1,165 +1,63 @@ import base64 import io import logging -import os -import uuid -import hashlib -from pathlib import Path from langchain_core.messages import HumanMessage, SystemMessage from common.config import get_multimodal_service logger = logging.getLogger(__name__) - - -def describe_image_with_llm(image_input): +def describe_image_with_llm(file_path): """ - Send image (pixmap or PIL image) to LLM vision model and return description. - Uses multimodal_service from config if available, otherwise falls back to completion_service. - Currently supports: OpenAI, Azure OpenAI, Google GenAI, and Google VertexAI + Read image file and convert to base64 to send to LLM. """ try: + from PIL import Image as PILImage + client = get_multimodal_service() if not client: return "[Image: Failed to create multimodal LLM client]" - + + # Read image and convert to base64 + pil_image = PILImage.open(file_path) buffer = io.BytesIO() - # Convert to RGB if needed for better compatibility - if image_input.mode != 'RGB': - image_input = image_input.convert('RGB') - image_input.save(buffer, format="JPEG", quality=95) - b64_img = base64.b64encode(buffer.getvalue()).decode("utf-8") + if pil_image.mode != 'RGB': + pil_image = pil_image.convert('RGB') + pil_image.save(buffer, format="JPEG", quality=95) + image_base64 = base64.b64encode(buffer.getvalue()).decode('utf-8') - # Build messages (system + human) messages = [ - SystemMessage( - content="You are a helpful assistant that describes images concisely for document analysis." - ), - HumanMessage( - content=[ - { - "type": "text", - "text": ( - "Please describe what you see in this image and " - "if the image has scanned text then extract all the text. " - "if the image has any logo, icon, or branding element, try to describe it with text. " - "Focus on any text, diagrams, charts, or other visual elements." - "If the image is purely a logo, icon, or branding element, start your response with 'LOGO:' or 'ICON:'." - ), - }, - { - "type": "image_url", - "image_url": {"url": f"data:image/jpeg;base64,{b64_img}"}, - }, - ] - ), + SystemMessage( + content="You are a helpful assistant that describes images concisely for document analysis." + ), + HumanMessage( + content=[ + { + "type": "text", + "text": ( + "Please describe what you see in this image and " + "if the image has scanned text then extract all the text. " + "If the image has any graph, chart, table, or other diagram, describe it. " + "If the image has any logo, identify and describe the logo." + ), + }, + { + "type": "image_url", + "image_url": {"url": f"data:image/jpeg;base64,{image_base64}"}, + }, + ], + ), ] - # Get response from LangChain LLM client - # Access the underlying LangChain client langchain_client = client.llm response = langchain_client.invoke(messages) - return response.content if hasattr(response, 'content') else str(response) + return response.content if hasattr(response, "content") else str(response) except Exception as e: logger.error(f"Failed to describe image with LLM: {str(e)}") return "[Image: Error processing image description]" -def save_image_and_get_markdown(image_input, context_info="", graphname=None): - """ - Save image locally to static/images/ folder and return markdown reference with description. - - LEGACY/OLD APPROACH: Used for backward compatibility with JSONL-based loading. - Images are saved as files and served via /ui/images/ endpoint with img:// protocol. - - For NEW direct loading approach, images are stored in Image vertex as base64 - and served via /ui/image_vertex/ endpoint with image:// protocol. - - Args: - image_input: PIL Image object - context_info: Optional context (e.g., "page 3 of invoice.pdf") - graphname: Graph name to organize images by graph (optional) - - Returns: - dict with: - - 'markdown': Markdown string with img:// reference - - 'image_id': Unique identifier for the saved image - - 'image_path': Path where image was saved to static/images/ - """ - try: - # FIRST: Get description from LLM to check if it's a logo - description = describe_image_with_llm(image_input) - - # Check if the image is a logo, icon, or decorative element BEFORE saving - # These should be filtered out as they're not content-relevant - description_lower = description.lower() - logo_indicators = ['logo', 'icon', 'branding', 'watermark', 'trademark', 'company logo', 'brand logo'] - - if any(indicator in description_lower for indicator in logo_indicators): - logger.info(f"Detected logo/icon in image, skipping: {description[:100]}") - return None - - # If not a logo, proceed with saving the image - # Generate unique image ID using hash of image content - buffer = io.BytesIO() - if image_input.mode != 'RGB': - image_input = image_input.convert('RGB') - image_input.save(buffer, format="JPEG", quality=95) - image_bytes = buffer.getvalue() - - # Create hash-based ID (deterministic for same image) - image_hash = hashlib.sha256(image_bytes).hexdigest()[:16] - image_id = f"{image_hash}.jpg" - - # Save image to local storage directory organized by graphname - project_root = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) - - # If graphname is provided, organize images by graph - if graphname: - images_dir = os.path.join(project_root, "static", "images", graphname) - # Include graphname in the image reference for URL construction - image_reference = f"{graphname}/{image_id}" - else: - images_dir = os.path.join(project_root, "static", "images") - image_reference = image_id - - os.makedirs(images_dir, exist_ok=True) - - image_path = os.path.join(images_dir, image_id) - - # Save image file (skip if already exists with same hash) - if not os.path.exists(image_path): - with open(image_path, 'wb') as f: - f.write(image_bytes) - logger.info(f"Saved content image to: {image_path}") - else: - logger.debug(f"Image already exists: {image_path}") - - # Generate markdown with custom img:// protocol (will be replaced later) - # Format: ![description](img://graphname/image_id) or ![description](img://image_id) - markdown = f"![{description}](img://{image_reference})" - - logger.info(f"Created image reference: {image_reference} with description") - - return { - 'markdown': markdown, - 'image_id': image_reference, - 'image_path': image_path, - 'description': description - } - - except Exception as e: - logger.error(f"Failed to save image and generate markdown: {str(e)}") - # Fallback to text description only - fallback_desc = f"[Image: {context_info} - processing failed]" - return { - 'markdown': fallback_desc, - 'image_id': None, - 'image_path': None, - 'description': fallback_desc - } diff --git a/common/utils/text_extractors.py b/common/utils/text_extractors.py index da3e22d..127f6ce 100644 --- a/common/utils/text_extractors.py +++ b/common/utils/text_extractors.py @@ -8,6 +8,8 @@ import uuid import base64 import io +import re +import threading from pathlib import Path import shutil import asyncio @@ -15,6 +17,59 @@ logger = logging.getLogger(__name__) +# Global lock for pymupdf4llm calls (not thread-safe) +_pymupdf4llm_lock = threading.Lock() + + +# regex for markdown images: ![alt](path) +_md_pattern = re.compile(r'!\[([^\]]*)\]\(([^)\s]+)\)') + +def extract_images(md_text): + """ + Returns list of {"path": path, "image_id": image_id} + image_id = basename without extension + """ + images = [] + for m in _md_pattern.finditer(md_text): + path = m.group(2) + basename = os.path.basename(path) + image_id = os.path.splitext(basename)[0] + images.append({"path": path, "image_id": image_id}) + return images + + +def insert_description_by_id(md_text, image_id, description): + """ + Replace the description for an image whose basename == image_id. + """ + def repl(m): + old_path = m.group(2) + candidate_id = os.path.splitext(os.path.basename(old_path))[0] + + if candidate_id == image_id: + return f'![{description}]({old_path})' + + return m.group(0) + + return _md_pattern.sub(repl, md_text) + + +def replace_path_with_tg_protocol(md_text, image_id, tg_reference): + """ + Replace the file path for an image whose basename == image_id with tg:// protocol reference. + tg_reference should be like 'Graphs_image_1' + """ + def repl(m): + old_path = m.group(2) + candidate_id = os.path.splitext(os.path.basename(old_path))[0] + + if candidate_id == image_id: + alt_text = m.group(1) + return f'![{alt_text}](tg://{tg_reference})' + + return m.group(0) + + return _md_pattern.sub(repl, md_text) class TextExtractor: """Class for handling text extraction from various file formats and cleanup.""" @@ -38,10 +93,16 @@ def __init__(self): '.jpg': 'image/jpeg' } - async def _process_file_async(self, file_path, folder_path_obj, graphname): + async def _process_file_async(self, file_path, graphname, temp_folder): """ Async helper to process a single file. Runs in thread pool to avoid blocking on I/O operations. + Creates one JSONL file per input file. + + Args: + file_path: Absolute path to the input file to be processed (e.g., "C:/data/docs/report.pdf"). + graphname: Name of the knowledge graph this file belongs to, used for metadata tagging. + temp_folder: Absolute path to the temporary directory where output JSONL files are written. """ try: loop = asyncio.get_event_loop() @@ -53,11 +114,25 @@ async def _process_file_async(self, file_path, folder_path_obj, graphname): graphname ) + # Create one JSONL file per input file + if doc_entries: + # Use the original filename (stem) for the JSONL file + file_stem = Path(file_path).stem + jsonl_file = os.path.join(temp_folder, f"{file_stem}.jsonl") + + await loop.run_in_executor( + None, + self._write_to_jsonl, + jsonl_file, + doc_entries + ) + + # Return metadata only, documents already saved to JSONL return { 'success': True, 'file_path': str(file_path), - 'documents': doc_entries, - 'num_documents': len(doc_entries) + 'num_documents': len(doc_entries), + 'jsonl_file': f"{Path(file_path).stem}.jsonl" } except FileNotFoundError: @@ -67,11 +142,21 @@ async def _process_file_async(self, file_path, folder_path_obj, graphname): except Exception as e: logger.warning(f"Failed to process file {file_path}: {e}") return {'success': False, 'file_path': str(file_path), 'error': str(e)} + + def _write_to_jsonl(self, jsonl_file, doc_entries): + """ + Write document entries to a JSONL file (one file per input file). + Each document is written as a separate line. + """ + with open(jsonl_file, 'w', encoding='utf-8') as f: + for doc_data in doc_entries: + json_line = json.dumps(doc_data, ensure_ascii=False) + f.write(json_line + '\n') - async def _process_folder_async(self, folder_path, graphname=None, max_concurrent=10): + async def _process_folder_async(self, folder_path, graphname, temp_folder, max_concurrent=10): """ Async version of process_folder for parallel file processing. - This prevents conflicts when multiple users process folders simultaneously. + Creates one JSONL file per input file. """ logger.info(f"Processing local folder ASYNC: {folder_path} for graph: {graphname} (max_concurrent={max_concurrent})") @@ -83,6 +168,10 @@ async def _process_folder_async(self, folder_path, graphname=None, max_concurren if not folder_path_obj.is_dir(): raise Exception(f"Path is not a directory: {folder_path}") + # Create temp folder for JSONL files + os.makedirs(temp_folder, exist_ok=True) + logger.info(f"Saving processed documents to: {temp_folder}") + def safe_walk(path): try: for item in path.iterdir(): @@ -110,13 +199,13 @@ def safe_walk(path): async def process_with_semaphore(file_path): async with semaphore: - return await self._process_file_async(file_path, folder_path_obj, graphname) + return await self._process_file_async(file_path, graphname, temp_folder) tasks = [process_with_semaphore(fp) for fp in files_to_process] results = await asyncio.gather(*tasks, return_exceptions=True) - all_documents = [] processed_files_info = [] + total_docs = 0 for result in results: if isinstance(result, Exception): @@ -124,10 +213,13 @@ async def process_with_semaphore(file_path): continue if result.get('success'): - all_documents.extend(result.get('documents', [])) + num_docs = result.get('num_documents', 0) + total_docs += num_docs + processed_files_info.append({ 'file_path': result['file_path'], - 'num_documents': result.get('num_documents', len(result.get('documents', []))), + 'num_documents': num_docs, + 'jsonl_file': result.get('jsonl_file'), 'status': 'success' }) else: @@ -137,23 +229,30 @@ async def process_with_semaphore(file_path): 'error': result.get('error', 'Unknown error') }) - logger.info(f"Processed {len(processed_files_info)} files, extracted {len(all_documents)} total documents") + logger.info(f"Processed {len(processed_files_info)} files, extracted {total_docs} total documents") + logger.info(f"Created {len([f for f in processed_files_info if f.get('status') == 'success'])} JSONL files in {temp_folder}") return { 'statusCode': 200, - 'message': f'Processed {len(processed_files_info)} files, {len(all_documents)} documents', - 'documents': all_documents, + 'message': f'Processed {len(processed_files_info)} files, {total_docs} documents', 'files': processed_files_info, - 'num_documents': len(all_documents) + 'num_documents': total_docs, + 'temp_folder': temp_folder } - def process_folder(self, folder_path, graphname=None): + def process_folder(self, folder_path, graphname, temp_folder): """ Process local folder with multiple file formats and extract text content. Uses async processing internally for parallel file handling. + Creates one JSONL file per input file. + + Args: + folder_path: Path to the folder containing files to process + graphname: Name of the graph (for context) + temp_folder: Path to save processed documents as JSONL files (one per input file) """ logger.info(f"Processing local folder: {folder_path} for graph: {graphname}") - return asyncio.run(self._process_folder_async(folder_path, graphname)) + return asyncio.run(self._process_folder_async(folder_path, graphname, temp_folder)) def extract_text_from_file_with_images_as_docs(file_path, graphname=None): @@ -183,137 +282,166 @@ def extract_text_from_file_with_images_as_docs(file_path, graphname=None): def _extract_pdf_with_images_as_docs(file_path, base_doc_id, graphname=None): """ - Extract PDF as ONE markdown document with inline image references. + Extract PDF as ONE markdown document with inline image references using pymupdf4llm. + Uses unique temporary folder per PDF to allow parallel processing. + After processing, delete the extracted image folder. """ + # Use unique folder per PDF to allow parallel processing without conflicts + unique_folder_id = uuid.uuid4().hex[:12] + image_output_folder = Path(f"tg_temp_{unique_folder_id}") + try: - import fitz # PyMuPDF + import pymupdf4llm from PIL import Image as PILImage + from common.utils.image_data_extractor import describe_image_with_llm + + # Ensure clean slate - remove folder if it exists from failed previous run + if image_output_folder.exists(): + shutil.rmtree(image_output_folder, ignore_errors=True) + + # Convert PDF to markdown with extracted image files + # Use lock because pymupdf4llm's table extraction is not thread-safe + # See: https://github.com/pymupdf/PyMuPDF/issues/3241 + with _pymupdf4llm_lock: + try: + markdown_content = pymupdf4llm.to_markdown( + file_path, + write_images=True, + image_path=str(image_output_folder), # unique folder per PDF + margins=0, + image_size_limit=0.08, + ) + except Exception: + # Retry with table_strategy="lines" if first attempt fails + try: + markdown_content = pymupdf4llm.to_markdown( + file_path, + write_images=True, + image_path=str(image_output_folder), # unique folder per PDF + margins=0, + image_size_limit=0.08, + table_strategy="lines", + ) + except Exception as e: + logger.error(f"pymupdf4llm failed for {file_path}: {e}") + # Cleanup folder if it was created + if image_output_folder.exists(): + shutil.rmtree(image_output_folder, ignore_errors=True) + return [{ + "doc_id": base_doc_id, + "doc_type": "markdown", + "content": f"[PDF extraction failed: {e}]", + "position": 0 + }] + + if not markdown_content or not markdown_content.strip(): + logger.warning(f"No content extracted from PDF: {file_path}") + + # Extract image references from markdown + image_refs = extract_images(markdown_content) + + if not image_refs: + # cleanup folder anyway + if image_output_folder.exists(): + shutil.rmtree(image_output_folder, ignore_errors=True) + + return [{ + "doc_id": base_doc_id, + "doc_type": "markdown", + "content": markdown_content, + "position": 0 + }] - doc = fitz.open(file_path) - markdown_parts = [] image_entries = [] image_counter = 0 - for page_num, page in enumerate(doc, start=1): - if page_num > 1: - markdown_parts.append("\n\n") - markdown_parts.append(f"--- Page {page_num} ---\n") #Avoid to be splitted as a single chunk - - blocks = page.get_text("blocks", sort=True) - text_blocks_with_pos = [] - - for block in blocks: - block_type = block[6] if len(block) > 6 else 0 - if block_type == 0: - text = block[4].strip() - if text: - y_pos = block[1] - text_blocks_with_pos.append({'type': 'text', 'content': text, 'y_pos': y_pos}) - - image_list = page.get_images(full=True) - images_with_pos = [] - - if image_list: - for img_index, img_info in enumerate(image_list): - try: - xref = img_info[0] - base_image = doc.extract_image(xref) - image_bytes = base_image["image"] - image_ext = base_image["ext"] - - img_rects = page.get_image_rects(xref) - y_pos = img_rects[0].y0 if img_rects else 999999 - - pil_image = PILImage.open(io.BytesIO(image_bytes)) - if pil_image.width < 100 or pil_image.height < 100: - continue - - from common.utils.image_data_extractor import describe_image_with_llm - description = describe_image_with_llm(pil_image) - description_lower = description.lower() - logo_indicators = [ - 'logo:', 'icon:', 'logo', 'icon', 'branding', - 'watermark', 'trademark', 'stylized letter', - 'stylized text', 'word "', "word '" - ] - if any(indicator in description_lower for indicator in logo_indicators): - continue - - buffer = io.BytesIO() - if pil_image.mode != 'RGB': - pil_image = pil_image.convert('RGB') - pil_image.save(buffer, format="JPEG", quality=95) - image_base64 = base64.b64encode(buffer.getvalue()).decode('utf-8') - - image_counter += 1 - image_doc_id = f"{base_doc_id}_image_{image_counter}" - - images_with_pos.append({ - 'type': 'image', - 'image_doc_id': image_doc_id, - 'description': description, - 'y_pos': y_pos, - 'image_data': image_base64, - 'image_format': image_ext, - 'width': pil_image.width, - 'height': pil_image.height - }) - except Exception as img_error: - logger.warning(f"Failed to extract image on page {page_num}: {img_error}") - - all_elements = text_blocks_with_pos + images_with_pos - all_elements.sort(key=lambda x: x['y_pos']) - - for element in all_elements: - if element['type'] == 'text': - markdown_parts.append(element['content']) - markdown_parts.append("\n\n") - else: - # Add image description as text, then markdown image reference - # Use short alt text in markdown, full description as regular text - markdown_parts.append(f"![{element['description']}](tg://{element['image_doc_id']})\n\n") - - image_entries.append({ - "doc_id": element['image_doc_id'], - "doc_type": "image", - "image_description": element['description'], - "image_data": element['image_data'], - "image_format": element['image_format'], - "parent_doc": base_doc_id, - "page_number": page_num, - "width": element['width'], - "height": element['height'], - "position": int(element['image_doc_id'].split('_')[-1]) - }) - - doc.close() - - markdown_content = "".join(markdown_parts) if markdown_parts else "" #No content extracted from PDF - if not markdown_content: - return [] + for img_ref in image_refs: + try: + img_path = Path(img_ref["path"]) # convert to Path + image_id = img_ref["image_id"] + + # Image description + description = describe_image_with_llm(str(img_path)) + + markdown_content = insert_description_by_id( + markdown_content, + image_id, + description + ) + + # Convert image to base64 + pil_image = PILImage.open(img_path) + buffer = io.BytesIO() + + if pil_image.mode != "RGB": + pil_image = pil_image.convert("RGB") + + pil_image.save(buffer, format="JPEG", quality=95) + image_base64 = base64.b64encode(buffer.getvalue()).decode("utf-8") + + image_counter += 1 + image_doc_id = f"{base_doc_id}_image_{image_counter}" + + # Replace file path with tg:// protocol reference in markdown + markdown_content = replace_path_with_tg_protocol( + markdown_content, + image_id, + image_doc_id + ) + + image_entries.append({ + "doc_id": image_doc_id, + "doc_type": "image", + "image_description": description, + "image_data": image_base64, + "image_format": "jpg", + "parent_doc": base_doc_id, + "page_number": 0, + "width": pil_image.width, + "height": pil_image.height, + "position": image_counter + }) + + except Exception as img_error: + logger.warning(f"Failed to process image {img_ref.get('path')}: {img_error}") + # FINAL CLEANUP — delete folder after processing everything + if image_output_folder.exists() and image_output_folder.is_dir(): + try: + shutil.rmtree(image_output_folder) + logger.debug(f"Deleted image folder: {image_output_folder}") + except Exception as delete_err: + logger.warning(f"Failed to delete folder {image_output_folder}: {delete_err}") + + # Build final result result = [{ "doc_id": base_doc_id, - "doc_type": "", + "doc_type": "markdown", "content": markdown_content, "position": 0 }] result.extend(image_entries) + return result - except ImportError: - logger.error("PyMuPDF not available") + except ImportError as import_err: + logger.error(f"Required library missing: {import_err}") + # Cleanup on import error + if image_output_folder.exists(): + shutil.rmtree(image_output_folder, ignore_errors=True) return [{ "doc_id": base_doc_id, - "doc_type": "", - "content": "[PDF extraction requires PyMuPDF]", + "doc_type": "markdown", + "content": "[PDF extraction requires pymupdf4llm and PyMuPDF]", "position": 0 }] except Exception as e: logger.error(f"Error extracting PDF: {e}") + # Cleanup on any other error + if image_output_folder.exists(): + shutil.rmtree(image_output_folder, ignore_errors=True) raise - def _extract_standalone_image_as_doc(file_path, base_doc_id, graphname=None): """ Extract standalone image file as ONE markdown document with inline image reference. @@ -324,25 +452,9 @@ def _extract_standalone_image_as_doc(file_path, base_doc_id, graphname=None): pil_image = PILImage.open(file_path) if pil_image.width < 100 or pil_image.height < 100: - return [{ - "doc_id": base_doc_id, - "doc_type": "", - "content": f"[Skipped small image: {file_path.name}]", - "position": 0 - }] + pass - description = describe_image_with_llm(pil_image) - description_lower = description.lower() - logo_indicators = ['logo:', 'icon:', 'logo', 'icon', 'branding', - 'watermark', 'trademark', 'stylized letter', - 'stylized text', 'word "', "word '"] - if any(indicator in description_lower for indicator in logo_indicators): - return [{ - "doc_id": base_doc_id, - "doc_type": "", - "content": f"[Skipped logo/icon: {file_path.name}]", - "position": 0 - }] + description = describe_image_with_llm(str(Path(file_path).absolute())) buffer = io.BytesIO() if pil_image.mode != 'RGB': @@ -353,7 +465,6 @@ def _extract_standalone_image_as_doc(file_path, base_doc_id, graphname=None): image_id = f"{base_doc_id}_image_1" # Put description as text, then markdown image reference with short alt text content = f"![{description}](tg://{image_id})" - return [ { "doc_id": base_doc_id, @@ -379,7 +490,7 @@ def _extract_standalone_image_as_doc(file_path, base_doc_id, graphname=None): logger.error(f"Error extracting image: {e}") return [{ "doc_id": base_doc_id, - "doc_type": "", + "doc_type": "markdown", "content": f"[Image extraction failed: {str(e)}]", "position": 0 }] @@ -441,12 +552,10 @@ def get_doc_type_from_extension(extension): if extension in ['.html', '.htm']: return 'html' - elif extension in ['.md']: - return 'markdown' elif extension in ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.tiff', '.webp']: return 'image' else: - return '' + return 'markdown' def get_supported_extensions(): @@ -457,4 +566,4 @@ def get_supported_extensions(): def is_supported_file(file_path): """Check if a file is supported for text extraction.""" extension = Path(file_path).suffix.lower() - return extension in get_supported_extensions() + return extension in get_supported_extensions() \ No newline at end of file diff --git a/graphrag-ui/src/pages/Setup.tsx b/graphrag-ui/src/pages/Setup.tsx index b7d357d..81bd193 100644 --- a/graphrag-ui/src/pages/Setup.tsx +++ b/graphrag-ui/src/pages/Setup.tsx @@ -56,7 +56,9 @@ const Setup = () => { const [uploadMessage, setUploadMessage] = useState(""); const [isIngesting, setIsIngesting] = useState(false); const [ingestMessage, setIngestMessage] = useState(""); - const [activeTab, setActiveTab] = useState("upload"); + // Ingestion job data state + const [ingestJobData, setIngestJobData] = useState(null); + const [directIngestion, setDirectIngestion] = useState(false); // Refresh state const [refreshOpen, setRefreshOpen] = useState(false); @@ -67,6 +69,7 @@ const Setup = () => { const [isCheckingStatus, setIsCheckingStatus] = useState(false); // S3 state + const [awsAccessKey, setAwsAccessKey] = useState(""); const [awsSecretKey, setAwsSecretKey] = useState(""); const [inputBucket, setInputBucket] = useState(""); @@ -92,7 +95,7 @@ const Setup = () => { const [downloadedFiles, setDownloadedFiles] = useState([]); const [isDownloading, setIsDownloading] = useState(false); const [downloadMessage, setDownloadMessage] = useState(""); - +const [activeTab, setActiveTab] = useState("upload"); // Fetch uploaded files const fetchUploadedFiles = async () => { if (!ingestGraphName) return; @@ -157,17 +160,34 @@ const Setup = () => { body: formData, }); + if (!response.ok) { + const errorData = await response.json(); + throw new Error(errorData.detail || `Upload failed: ${response.statusText}`); + } + const data = await response.json(); if (data.status === "success") { - setUploadMessage(`✅ ${data.message}`); + const uploadedCount = selectedFiles?.length || 0; + setUploadMessage("✅ Successfully uploaded the files. Processing..."); setSelectedFiles(null); await fetchUploadedFiles(); + setIsUploading(false); + + // Step 2: Call create_ingest to process uploaded files in background + console.log("Calling handleCreateIngestAfterUpload from main upload..."); + handleCreateIngestAfterUpload("uploaded", uploadedCount).catch((err) => { + console.error("Error in background processing:", err); + setUploadMessage(`❌ Processing error: ${err.message}`); + }); } else { setUploadMessage(`⚠️ ${data.message}`); + setIsUploading(false); } } catch (error: any) { - setUploadMessage(`❌ Error: ${error.message}`); - } finally { + console.error("Upload error:", error); + // Show warning icon for lock conflicts, error icon for actual errors + const isLockConflict = error.message?.includes("currently being processed"); + setUploadMessage(isLockConflict ? `⚠️ ${error.message}` : `❌ Error: ${error.message}`); setIsUploading(false); } }; @@ -201,7 +221,8 @@ const Setup = () => { }); if (!response.ok) { - throw new Error(`Upload failed with status ${response.status}`); + const errorData = await response.json(); + throw new Error(errorData.detail || `Upload failed with status ${response.status}`); } const data = await response.json(); @@ -219,14 +240,20 @@ const Setup = () => { // Show final result if (failedCount === 0) { - setUploadMessage(`✅ Successfully uploaded all ${uploadedCount} files (uploaded individually).`); + setUploadMessage(`✅ Successfully uploaded all ${uploadedCount} files. Processing...`); } else { - setUploadMessage(`⚠️ Uploaded ${uploadedCount} files successfully, ${failedCount} failed.`); + setUploadMessage(`⚠️ Uploaded ${uploadedCount} files successfully, ${failedCount} failed. Processing...`); } setSelectedFiles(null); await fetchUploadedFiles(); + + // Step 2: Call create_ingest to process uploaded files + console.log("Calling handleCreateIngestAfterUpload..."); + await handleCreateIngestAfterUpload("uploaded", uploadedCount); + console.log("handleCreateIngestAfterUpload completed"); } catch (error: any) { + console.error("Upload error:", error); setUploadMessage(`❌ Batch upload error: ${error.message}`); } finally { setIsUploading(false); @@ -236,20 +263,27 @@ const Setup = () => { // Delete a specific file const handleDeleteFile = async (filename: string) => { if (!ingestGraphName) return; + + console.log("Deleting file:", filename); try { const creds = localStorage.getItem("creds"); - const response = await fetch( - `/ui/${ingestGraphName}/uploads?filename=${encodeURIComponent(filename)}`, - { + + // Delete original file + const url = `/ui/${ingestGraphName}/uploads?filename=${encodeURIComponent(filename)}`; + + const response = await fetch(url, { method: "DELETE", headers: { Authorization: `Basic ${creds}` }, - } - ); + }); const data = await response.json(); setUploadMessage(`✅ ${data.message}`); await fetchUploadedFiles(); + + // Clear ingest message when deleting files + setIngestMessage(""); } catch (error: any) { + console.error("Delete error:", error); setUploadMessage(`❌ Error: ${error.message}`); } }; @@ -268,6 +302,11 @@ const Setup = () => { headers: { Authorization: `Basic ${creds}` }, }); const data = await response.json(); + + // Clear all temp state + setIngestJobData(null); + setIngestMessage(""); // Clear any previous ingestion messages + setUploadMessage(`✅ ${data.message}`); await fetchUploadedFiles(); } catch (error: any) { @@ -358,17 +397,32 @@ const Setup = () => { body: JSON.stringify(requestBody), }); + if (!response.ok) { + const errorData = await response.json(); + throw new Error(errorData.detail || `Download failed: ${response.statusText}`); + } + const data = await response.json(); if (data.status === "success") { - setDownloadMessage(`✅ ${data.message}`); + const downloadCount = data.downloaded_files?.length || downloadedFiles.length; + setDownloadMessage("✅ Successfully downloaded the files. Processing..."); await fetchDownloadedFiles(); + setIsDownloading(false); + // Step 2: Call create_ingest to process downloaded files in background + handleCreateIngestAfterUpload("downloaded", downloadCount).catch((err) => { + console.error("Error in background processing:", err); + setDownloadMessage(`❌ Processing error: ${err.message}`); + }); } else if (data.status === "warning") { setDownloadMessage(`⚠️ ${data.message}`); + setIsDownloading(false); } else { setDownloadMessage(`❌ ${data.message || "Download failed"}`); + setIsDownloading(false); } } catch (error: any) { - setDownloadMessage(`❌ Error: ${error.message}`); + const isLockConflict = error.message?.includes("currently being processed"); + setDownloadMessage(isLockConflict ? `⚠️ ${error.message}` : `❌ Error: ${error.message}`); } finally { setIsDownloading(false); } @@ -380,13 +434,14 @@ const Setup = () => { try { const creds = localStorage.getItem("creds"); - const response = await fetch( - `/ui/${ingestGraphName}/cloud/delete?filename=${encodeURIComponent(filename)}`, - { + + // Delete original file + const url = `/ui/${ingestGraphName}/cloud/delete?filename=${encodeURIComponent(filename)}`; + + const response = await fetch(url, { method: "DELETE", headers: { Authorization: `Basic ${creds}` }, - } - ); + }); const data = await response.json(); setDownloadMessage(`✅ ${data.message}`); await fetchDownloadedFiles(); @@ -416,6 +471,67 @@ const Setup = () => { } }; + + // Ingest flows (create ingest, run ingest) + // ------------------------- + const handleRunIngest = async (sourceType: "uploaded" | "downloaded" = "uploaded") => { + if (!ingestGraphName) { + setIngestMessage("❌ Please select a graph"); + return; + } + + setIsIngesting(true); + setIngestMessage("Ingesting documents into knowledge graph..."); + + try { + const creds = localStorage.getItem("creds"); + const folderPath = sourceType === "uploaded" ? `uploads/${ingestGraphName}` : `downloaded_files_cloud/${ingestGraphName}`; + + // Use existing ingestJobData if available, otherwise construct from folder path + const jobData = ingestJobData || { + load_job_id: "load_documents_content_json", + data_source_id: { + data_source: "server", + data_source_config: { data_path: folderPath }, + loader_config: {}, + file_format: "multi" + }, + data_path: folderPath, + }; + + const ingestResponse = await fetch(`/ui/${ingestGraphName}/ingest`, { + method: "POST", + headers: { + "Content-Type": "application/json", + Authorization: `Basic ${creds}`, + }, + body: JSON.stringify({ + load_job_id: jobData.load_job_id, + data_source_id: jobData.data_source_id, + file_path: jobData.data_path, + }), + }); + + if (!ingestResponse.ok) { + const errorData = await ingestResponse.json(); + throw new Error(errorData.detail || `Failed to ingest: ${ingestResponse.statusText}`); + } + + const ingestData = await ingestResponse.json(); + console.log("Ingest response:", ingestData); + + setIngestMessage(`✅ Ingestion completed successfully!`); + setUploadMessage(""); + } catch (error: any) { + console.error("Error during ingestion:", error); + // Show warning icon for rebuild conflicts, error icon for actual errors + const isRebuildConflict = error.message?.includes("currently being rebuilt"); + setIngestMessage(isRebuildConflict ? `⚠️ ${error.message}` : `❌ Error: ${error.message}`); + } finally { + setIsIngesting(false); + } + }; + // Ingest files into knowledge graph (uploaded or downloaded) const handleIngestDocuments = async (sourceType: "uploaded" | "downloaded" = "uploaded") => { if (!ingestGraphName) { @@ -423,9 +539,8 @@ const Setup = () => { return; } - const folderPath = sourceType === "uploaded" - ? `uploads/${ingestGraphName}` - : `downloaded_files_cloud/${ingestGraphName}`; + const folderPath = sourceType === "uploaded" ? `uploads/${ingestGraphName}` : `downloaded_files_cloud/${ingestGraphName}`; + const fileCount = sourceType === "uploaded" ? uploadedFiles.length : downloadedFiles.length; setIsIngesting(true); setIngestMessage("Step 1/2: Creating ingest job..."); @@ -437,7 +552,7 @@ const Setup = () => { const createIngestConfig = { data_source: "server", data_source_config: { - folder_path: folderPath + data_path: folderPath, }, loader_config: {}, file_format: "multi" @@ -458,15 +573,27 @@ const Setup = () => { } const createData = await createResponse.json(); - //console.log("Create ingest response:", createData); + console.log("Create ingest response:", createData); - // Step 2: Run ingest + // Store ingest job data for later use (store folderPath as source_data_path for temp folder deletion) + setIngestJobData({ + load_job_id: createData.load_job_id, + data_source_id: createData.data_source_id, + data_path: folderPath, // Use the source folderPath, not the backend's "in_temp_storage" + }); + + if (!directIngestion) { + // Files are saved to temp storage - show message for review (only if not direct ingestion) + setIngestMessage(`✅ ${fileCount} file(s) ready for ingestion.`); + setIsIngesting(false); + } else { + // Direct ingestion enabled - proceed directly to ingest setIngestMessage("Step 2/2: Running document ingest..."); const loadingInfo = { load_job_id: createData.load_job_id, data_source_id: createData.data_source_id, - file_path: createData.data_path || createData.file_path, // Handle both field names + file_path: createData.data_path || createData.file_path, }; const ingestResponse = await fetch(`/ui/${ingestGraphName}/ingest`, { @@ -484,16 +611,94 @@ const Setup = () => { } const ingestData = await ingestResponse.json(); - //console.log("Ingest response:", ingestData); + console.log("Ingest response:", ingestData); setIngestMessage(`✅ Data ingested successfully! Processed documents from ${folderPath}/`); + setIsIngesting(false); + } } catch (error: any) { console.error("Error ingesting data:", error); - setIngestMessage(`❌ Error: ${error.message}`); - } finally { + // Show warning icon for rebuild conflicts, error icon for actual errors + const isRebuildConflict = error.message?.includes("currently being rebuilt"); + setIngestMessage(isRebuildConflict ? `⚠️ ${error.message}` : `❌ Error: ${error.message}`); setIsIngesting(false); } }; + // Called automatically after upload or cloud download finishes. + // Creates an ingest job that processes files into JSONL format in temp folder. + const handleCreateIngestAfterUpload = async (sourceType: "uploaded" | "downloaded" = "uploaded", fileCountParam?: number) => { + console.log("handleCreateIngestAfterUpload called with sourceType:", sourceType); + console.log("ingestGraphName:", ingestGraphName); + + if (!ingestGraphName) { + console.log("No graph name, returning early"); + return; + } + + const folderPath = sourceType === "uploaded" ? `uploads/${ingestGraphName}` : `downloaded_files_cloud/${ingestGraphName}`; + // Use passed file count or fallback to state arrays + const fileCount = fileCountParam || (sourceType === "uploaded" ? uploadedFiles.length : downloadedFiles.length); + + console.log("folderPath:", folderPath); + console.log("fileCount:", fileCount); + + try { + const creds = localStorage.getItem("creds"); + + // Call create_ingest to process files + const createIngestConfig = { + data_source: "server", + data_source_config: { + data_path: folderPath, + }, + loader_config: {}, + file_format: "multi", + }; + + console.log("Calling create_ingest with config:", createIngestConfig); + + const createResponse = await fetch(`/ui/${ingestGraphName}/create_ingest`, { + method: "POST", + headers: { + "Content-Type": "application/json", + Authorization: `Basic ${creds}`, + }, + body: JSON.stringify(createIngestConfig), + }); + + console.log("create_ingest response status:", createResponse.status); + + if (!createResponse.ok) { + const errorData = await createResponse.json(); + console.error("create_ingest error:", errorData); + throw new Error(errorData.detail || `Failed to create ingest job: ${createResponse.statusText}`); + } + + const createData = await createResponse.json(); + console.log("create_ingest response data:", createData); + + // Save ingest job data for later (store folderPath as data_path for temp folder deletion) + setIngestJobData({ + load_job_id: createData.load_job_id, + data_source_id: createData.data_source_id, + data_path: folderPath, + }); + + console.log("Direct ingestion enabled:", directIngestion); + + if (directIngestion) { + // Direct ingestion - proceed to ingest immediately + setUploadMessage("Running direct ingestion..."); + await handleRunIngest(sourceType); + } else { + // Save for later - files ready for ingestion + setUploadMessage(`✅ ${fileCount} file(s) ready for ingestion.`); + } + } catch (error: any) { + console.error("Error in create_ingest:", error); + setUploadMessage(`❌ Processing error: ${error.message}`); + } + }; // Ingest files from S3 with Amazon BDA const handleAmazonBDAIngest = async () => { @@ -636,7 +841,9 @@ const Setup = () => { } catch (error: any) { console.error("Error ingesting files:", error); - setIngestMessage(`❌ Error: ${error.message}`); + // Show warning icon for rebuild conflicts, error icon for actual errors + const isRebuildConflict = error.message?.includes("currently being rebuilt"); + setIngestMessage(isRebuildConflict ? `⚠️ ${error.message}` : `❌ Error: ${error.message}`); } finally { setIsIngesting(false); } @@ -667,29 +874,25 @@ const Setup = () => { setIsRebuildRunning(isCurrentlyRunning); + if (statusData.status === "error" || statusData.status === "unknown") { + return; + } + if (isCurrentlyRunning) { const startTime = statusData.started_at ? new Date(statusData.started_at * 1000).toLocaleString() : "unknown time"; setRefreshMessage(`⚠️ A rebuild is already in progress for "${graphName}" (started at ${startTime}). Please wait for it to complete.`); - } else { - // Rebuild is not running anymore - if (wasRunning && statusData.status === "completed") { - // Just finished - setRefreshMessage(`✅ Rebuild completed successfully for "${graphName}".`); - } else if (statusData.status === "failed") { - setRefreshMessage(`❌ Previous rebuild failed: ${statusData.error || "Unknown error"}`); - } else { - // Clear message only if we're not showing loading message - if (!showLoadingMessage) { - setRefreshMessage(""); - } - } + } else if (wasRunning && statusData.status === "completed") { + setRefreshMessage(`✅ Rebuild completed successfully for "${graphName}".`); + } else if (statusData.status === "failed") { + setRefreshMessage(`❌ Previous rebuild failed: ${statusData.error || "Unknown error"}`); + } else if (statusData.status === "idle") { + setRefreshMessage(""); } } } catch (error: any) { console.error("Error checking rebuild status:", error); - // On error, assume it's safe to proceed - setIsRebuildRunning(false); - setRefreshMessage(""); + // On error, don't change state - keep existing message + // Don't clear existing messages on error } finally { setIsCheckingStatus(false); } @@ -717,12 +920,33 @@ const Setup = () => { return; } + // Check status one final time RIGHT before submitting (to catch any race conditions) setIsRefreshing(true); - setRefreshMessage("Submitting rebuild request..."); - + setRefreshMessage("Verifying rebuild status..."); + try { const creds = localStorage.getItem("creds"); + // Final status check to prevent race conditions + const statusCheckResponse = await fetch(`/ui/${refreshGraphName}/rebuild_status`, { + method: "GET", + headers: { + Authorization: `Basic ${creds}`, + }, + }); + + if (statusCheckResponse.ok) { + const statusData = await statusCheckResponse.json(); + if (statusData.is_running) { + setRefreshMessage(`⚠️ A rebuild is already in progress for "${refreshGraphName}". Please wait for it to complete.`); + setIsRebuildRunning(true); + setIsRefreshing(false); + return; + } + } + + setRefreshMessage("Submitting rebuild request..."); + const response = await fetch(`/ui/${refreshGraphName}/rebuild_graph`, { method: "POST", headers: { @@ -732,6 +956,12 @@ const Setup = () => { if (!response.ok) { const errorData = await response.json(); + // For 409 (lock conflict), show message as-is without "Error:" prefix + if (response.status === 409) { + setRefreshMessage(`⚠️ ${errorData.detail || errorData.message}`); + setIsRefreshing(false); + return; + } throw new Error(errorData.detail || `Failed to refresh graph: ${response.statusText}`); } @@ -1221,43 +1451,16 @@ const Setup = () => { )} - {/* Ingest Data Section */} - {uploadedFiles.length > 0 && ( -
-

- Ingest Documents into Knowledge Graph -

-

- Process uploaded files and add them to the knowledge graph -

- - {ingestMessage && ( -
- {ingestMessage} -
- )} + {/* Ingestion Status Message */} + {ingestMessage && ( +
+ {ingestMessage}
)} @@ -1289,6 +1492,35 @@ const Setup = () => {
)} + + {/* Ingest Data Section */} + {uploadedFiles.length > 0 && ( +
+

+ Ingest Documents into Knowledge Graph +

+

+ Process uploaded files and add them to the knowledge graph +

+ +
+ )} @@ -1575,7 +1807,7 @@ const Setup = () => { Process downloaded files and add them to the knowledge graph

- {ingestMessage && ( -
- {ingestMessage} -
- )} )} @@ -1762,6 +1983,10 @@ const Setup = () => { return; } setRefreshOpen(open); + // Clear message when closing dialog + if (!open) { + setRefreshMessage(""); + } }} > = max_wait_time: + LogWriter.error(f"ECC rebuild monitoring timed out for {graphname} after {max_wait_time}s") + + except Exception as e: + LogWriter.error(f"Error during ECC rebuild monitoring for {graphname}: {e}") + import traceback + LogWriter.error(traceback.format_exc()) + finally: + # Release lock only after ALL stages complete (or timeout/error) + release_rebuild_lock(graphname) + LogWriter.info(f"Released global rebuild lock for {graphname}") + + bg_tasks.add_task(rebuild_and_monitor) return {"status": "submitted"} @@ -318,6 +399,21 @@ def create_ingest( This sets up the data source and load job configuration for document ingestion. Uses HTTP Basic Authentication to get credentials and create a connection. """ + # Check if this graph is currently being rebuilt + currently_rebuilding = get_rebuilding_graph() + if currently_rebuilding == graphname: + raise HTTPException( + status_code=409, + detail=f"Graph '{graphname}' is currently being rebuilt. Please wait for the rebuild to complete before ingesting documents." + ) + + # Acquire graph lock + if not acquire_graph_lock(graphname, "create_ingest"): + raise HTTPException( + status_code=409, + detail=f"Graph '{graphname}' is currently being processed by another operation. Please wait and try again." + ) + try: # Extract credentials from the dependency (same pattern as other endpoints) creds = creds[1] @@ -330,12 +426,16 @@ def create_ingest( return result + except HTTPException: + raise except Exception as e: LogWriter.error(f"Error creating ingest configuration for graph {graphname}: {str(e)}") raise HTTPException( status_code=500, detail=f"Failed to create ingest configuration: {str(e)}" ) + finally: + release_graph_lock(graphname, "create_ingest") @router.post(route_prefix + "/{graphname}/ingest") @@ -349,6 +449,21 @@ def ingest( This processes documents from the configured data source and loads them into the graph. Uses HTTP Basic Authentication to get credentials and create a connection. """ + # Check if this graph is currently being rebuilt + currently_rebuilding = get_rebuilding_graph() + if currently_rebuilding == graphname: + raise HTTPException( + status_code=409, + detail=f"Graph '{graphname}' is currently being rebuilt. Please wait for the rebuild to complete before ingesting documents." + ) + + # Acquire graph lock + if not acquire_graph_lock(graphname, "ingest"): + raise HTTPException( + status_code=409, + detail=f"Graph '{graphname}' is currently being processed by another operation. Please wait and try again." + ) + try: # Extract credentials from the dependency (same pattern as other endpoints) creds = creds[1] @@ -361,12 +476,16 @@ def ingest( return result + except HTTPException: + raise except Exception as e: LogWriter.error(f"Error running ingestion for graph {graphname}: {str(e)}") raise HTTPException( status_code=500, detail=f"Failed to run ingestion: {str(e)}" ) + finally: + release_graph_lock(graphname, "ingest") @router.get(route_prefix + "/image_vertex/{graphname}/{image_id}") @@ -928,6 +1047,14 @@ async def upload_files( - files: List of files to upload - overwrite: If False (default), will reject if files already exist """ + # Acquire graph lock + acquired = await asyncio.to_thread(acquire_graph_lock, graphname, "upload_files") + if not acquired: + raise HTTPException( + status_code=409, + detail=f"Graph '{graphname}' is currently being processed by another operation. Please wait and try again." + ) + try: upload_dir = os.path.join("uploads", graphname) os.makedirs(upload_dir, exist_ok=True) @@ -977,11 +1104,15 @@ async def upload_files( "total_size": total_size, } + except HTTPException: + raise except Exception as e: exc = traceback.format_exc() logger.error(f"Error uploading files for graph {graphname}: {e}") logger.debug_pii(f"Upload error trace:\n{exc}") raise HTTPException(status_code=500, detail=f"Error uploading files: {str(e)}") + finally: + await asyncio.to_thread(release_graph_lock, graphname, "upload_files") @router.delete(route_prefix + "/{graphname}/uploads") @@ -1010,7 +1141,23 @@ async def clear_uploaded_files( deleted_files = [] if filename: - # Delete specific file + # Delete corresponding JSONL file from temp folder FIRST + temp_folder = os.path.join("uploads", "ingestion_temp", graphname) + if os.path.exists(temp_folder): + from pathlib import Path + file_stem = Path(filename).stem + jsonl_file = os.path.join(temp_folder, f"{file_stem}.jsonl") + + if os.path.exists(jsonl_file): + os.remove(jsonl_file) + logger.info(f"Deleted corresponding JSONL file: {file_stem}.jsonl") + + # If temp folder is now empty, remove it + if not os.listdir(temp_folder): + os.rmdir(temp_folder) + logger.info(f"Removed empty temp folder for graph {graphname}") + + # Then delete the raw file file_path = os.path.join(upload_dir, filename) if os.path.exists(file_path) and os.path.isfile(file_path): os.remove(file_path) @@ -1030,6 +1177,13 @@ async def clear_uploaded_files( if not os.listdir(upload_dir): os.rmdir(upload_dir) + # Also delete the entire temp folder for this graph + temp_folder = os.path.join("uploads", "ingestion_temp", graphname) + if os.path.exists(temp_folder): + import shutil + shutil.rmtree(temp_folder) + logger.info(f"Deleted temp folder for graph {graphname}") + logger.info(f"Deleted {len(deleted_files)} file(s) for graph {graphname}") return { @@ -1067,6 +1221,14 @@ async def download_from_cloud( - For GCS: project_id, gcs_credentials_json, bucket, prefix - For Azure: account_name, account_key, container, prefix """ + # Acquire graph lock + acquired = await asyncio.to_thread(acquire_graph_lock, graphname, "download_from_cloud") + if not acquired: + raise HTTPException( + status_code=409, + detail=f"Graph '{graphname}' is currently being processed by another operation. Please wait and try again." + ) + try: # Extract parameters from request body provider = request_body.get("provider") @@ -1267,6 +1429,8 @@ async def download_from_cloud( logger.error(f"Error downloading from cloud for graph {graphname}: {e}") logger.debug_pii(f"Cloud download error trace:\n{exc}") raise HTTPException(status_code=500, detail=f"Error downloading from cloud: {str(e)}") + finally: + await asyncio.to_thread(release_graph_lock, graphname, "download_from_cloud") @router.get(route_prefix + "/{graphname}/cloud/list") @@ -1342,7 +1506,23 @@ async def delete_cloud_downloads( deleted_files = [] if filename: - # Delete specific file + # Delete corresponding JSONL file from temp folder FIRST + temp_folder = os.path.join("downloaded_files_cloud", "ingestion_temp", graphname) + if os.path.exists(temp_folder): + from pathlib import Path + file_stem = Path(filename).stem + jsonl_file = os.path.join(temp_folder, f"{file_stem}.jsonl") + + if os.path.exists(jsonl_file): + os.remove(jsonl_file) + logger.info(f"Deleted corresponding JSONL file: {file_stem}.jsonl") + + # If temp folder is now empty, remove it + if not os.listdir(temp_folder): + os.rmdir(temp_folder) + logger.info(f"Removed empty temp folder for graph {graphname}") + + # Then delete the raw file file_path = os.path.join(download_dir, filename) if os.path.exists(file_path) and os.path.isfile(file_path): os.remove(file_path) @@ -1362,6 +1542,13 @@ async def delete_cloud_downloads( if not os.listdir(download_dir): os.rmdir(download_dir) + # Also delete the entire temp folder for this graph + temp_folder = os.path.join("downloaded_files_cloud", "ingestion_temp", graphname) + if os.path.exists(temp_folder): + import shutil + shutil.rmtree(temp_folder) + logger.info(f"Deleted temp folder for graph {graphname}") + logger.info(f"Deleted {len(deleted_files)} cloud download(s) for graph {graphname}") return { @@ -1378,4 +1565,3 @@ async def delete_cloud_downloads( logger.error(f"Error deleting cloud downloads for graph {graphname}: {e}") logger.debug_pii(f"Delete error trace:\n{exc}") raise HTTPException(status_code=500, detail=f"Error deleting files: {str(e)}") - diff --git a/graphrag/app/supportai/supportai.py b/graphrag/app/supportai/supportai.py index d2efe8a..69727f4 100644 --- a/graphrag/app/supportai/supportai.py +++ b/graphrag/app/supportai/supportai.py @@ -337,9 +337,9 @@ def create_ingest( conn: TigerGraphConnection, ): # Check for invalid combination of multi format and non-s3 data source - if ingest_config.data_source.lower() in ["bda", "server"] and ingest_config.get("file_format", "").lower() != "multi": - logger.warning(f"File format {ingest_config.get('file_format', '').lower()} is not supported for data source {ingest_config.data_source.lower()}") - ingest_config["file_format"] = "multi" + if ingest_config.data_source.lower() in ["bda", "server"] and getattr(ingest_config, "file_format", "").lower() != "multi": + logger.warning(f"File format {getattr(ingest_config, 'file_format', '')} is not supported for data source {ingest_config.data_source.lower()}") + ingest_config.file_format = "multi" res_ingest_config = {"data_source": ingest_config.data_source.lower()} res_ingest_config["file_format"] = ingest_config.file_format.lower() @@ -485,18 +485,28 @@ def create_ingest( if data_path is None: raise Exception("Data path not provided for server processing") try: + #create temp folder + base_dir = os.path.dirname(data_path) + temp_folder = os.path.join(base_dir, "ingestion_temp", graphname) + + # Process files and save immediately to temp folder (memory efficient) extractor = TextExtractor() - server_processing_result = extractor.process_folder(data_path, graphname=graphname) + server_processing_result = extractor.process_folder( + data_path, + graphname=graphname, + temp_folder=temp_folder # Extractor saves files as it processes + ) if server_processing_result.get("statusCode") != 200: raise Exception(f"Server folder processing failed: {server_processing_result}") - else: - logger.info(f"Server folder processing completed successfully: {server_processing_result}") + + doc_count = server_processing_result.get("num_documents", 0) + logger.info(f"Server folder processing completed: {server_processing_result.get('message')}") - res_ingest_config["server_jobs"] = server_processing_result.get("documents", []) + res_ingest_config["data_path"] = temp_folder + res_ingest_config["file_count"] = doc_count res_ingest_config["data_source_id"] = "DocumentContent" - # Use a placeholder path that doesn't start with "/" to avoid pyTigerGraph treating it as a file - # The actual folder path is stored in server_jobs, this is just for the API call - res["data_path"] = "in_response" + # Use a placeholder path to indicate temp storage + res["data_path"] = "in_temp_storage" res["data_source_id"] = res_ingest_config except Exception as e: raise Exception(f"Error during server folder processing: {e}") @@ -648,42 +658,67 @@ def ingest( } elif ingest_config.get("data_source") == "server": try: - processed_files = [] data_source_id = ingest_config.get("data_source_id", "DocumentContent") - if ingest_config.get("server_jobs"): - for doc_data in ingest_config.get("server_jobs"): - if not doc_data.get("doc_id") or not doc_data.get("content"): - continue - if doc_data.get("image_data"): - payload = { - "doc_id": doc_data.get("doc_id", ""), - "doc_type": "image", - "image_data": doc_data.get("image_data", ""), - "image_format": doc_data.get("image_format", "jpg"), - "parent_doc": doc_data.get("parent_doc", ""), - "page_number": doc_data.get("page_number", 0), - "position": doc_data.get("position", 0), - "content": "" - } - else: - payload = { - "doc_id": doc_data.get("doc_id", ""), - "doc_type": doc_data.get("doc_type", "markdown"), - "content": doc_data.get("content", "") - } - payload_json = json.dumps(payload) - conn.runLoadingJobWithData(payload_json, data_source_id, loader_info.load_job_id) - processed_files.append({ - 'file_path': doc_data.get("doc_id", ""), - 'parent_doc': doc_data.get("parent_doc", ""), + + # Read from temporary folder containing JSONL files (one per input file) + data_path = ingest_config.get("data_path") + if not data_path or not os.path.exists(data_path): + raise Exception(f"Data path not found: {data_path}") + + # Get all JSONL files from temp folder + jsonl_files = [f for f in os.listdir(data_path) if f.endswith('.jsonl')] + + if not jsonl_files: + raise Exception(f"No JSONL files found in: {data_path}") + + logger.info(f"Found {len(jsonl_files)} JSONL files to ingest from: {data_path}") + + total_doc_count = 0 + ingested_files = [] + + # Process each JSONL file separately + for jsonl_filename in jsonl_files: + jsonl_file = os.path.join(data_path, jsonl_filename) + logger.info(f"Processing JSONL file: {jsonl_filename}") + + try: + # Load documents directly from file - more memory efficient + conn.runLoadingJobWithFile(jsonl_file, data_source_id, loader_info.load_job_id) + + # Count documents for reporting + with open(jsonl_file, 'r', encoding='utf-8') as f: + doc_count = sum(1 for line in f if line.strip()) + total_doc_count += doc_count + + ingested_files.append({ + 'jsonl_file': jsonl_filename, + 'document_count': doc_count, + 'status': 'success' }) - logger.info(f"Data uploading done for doc_id: {doc_data.get('doc_id', 'unknown')}") + + logger.info(f"Successfully ingested {doc_count} documents from {jsonl_filename}") + + except Exception as file_error: + logger.error(f"Failed to ingest {jsonl_filename}: {file_error}") + ingested_files.append({ + 'jsonl_file': jsonl_filename, + 'status': 'failed', + 'error': str(file_error) + }) + + # Keep temp files for potential re-ingestion (faster, no need to re-process PDFs/images) + # Files will be cleaned up when user deletes source files via delete endpoints + logger.info(f"Ingestion complete. Temp files preserved at: {data_path}") + except Exception as e: raise Exception(f"Error during server markdown extraction and TigerGraph loading: {e}") return { "job_name": loader_info.load_job_id, - "summary": processed_files + "summary": f"Successfully ingested {total_doc_count} documents from {len(jsonl_files)} JSONL files", + "document_count": total_doc_count, + "ingested_files": ingested_files } + else: raise Exception("Data source and file format combination not implemented") else: diff --git a/licenses/pymupdf4llm-AGPL-3.0.txt b/licenses/pymupdf4llm-AGPL-3.0.txt new file mode 100644 index 0000000..0ad25db --- /dev/null +++ b/licenses/pymupdf4llm-AGPL-3.0.txt @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +.