Unify RabbitMQ handling with persistent, auto-reconnecting connections - #70

Merged
maxi07 merged 11 commits into
mainfrom
copilot/handle-rabbitmq-connection
Jul 4, 2026
Merged

Unify RabbitMQ handling with persistent, auto-reconnecting connections#70
maxi07 merged 11 commits into
mainfrom
copilot/handle-rabbitmq-connection

Conversation

CopilotAI commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

Services each built their own RabbitMQ connections and rebuilt them constantly, so the broker dropped clients with missed heartbeats from client, timeout: 60s. The goal: establish connections once, keep them alive, and centralize the logic.

Root cause

  • sqlite_wrapper opened the SSE publisher with the default 60s heartbeat and never serviced it during long OCR/upload/naming work → broker closed it every ~60s.
  • forward_to_rabbitmq opened and closed a new connection per message.
  • Every service duplicated its own connect/reconnect loop.

Changes

  • New scansynclib/rabbitmq.py — single source of truth for messaging:
    • RabbitMQClient: wraps one long-lived BlockingConnection, lazily connects, re-declares queues/exchanges after a reconnect, and transparently reconnects on publish/consume failures (default heartbeat 600s).
    • Helpers: publish, forward_to_rabbitmq (shared publisher connection), publish_to_exchange, consume (unified reconnecting consumer loop), process_events (heartbeat servicing for polling publishers), and a backward-compatible connect_rabbitmq.
  • helpers.py re-exports these so existing imports keep working.
  • sqlite_wrapper.py — SSE notify_sse_clients now publishes through the self-healing publisher (fixes the 60s drops).
  • Services refactored — OCR / file_naming / upload / metadata consume via consume(...); metadata publishes to ocr_queue via publish(...); detection uses RabbitMQClient + process_events; the web SSE listener reconnects instead of killing its thread. file_naming's fragile manual re-ack was dropped (broker redelivers after reconnect).
  • tests/test_rabbitmq.py — covers connection reuse, reconnect on StreamLostError, publish-failure handling, exchange declaration, pickling in forward_to_rabbitmq, and consumer reconnection.

Before → after

# Before: new connection opened and torn down for every messagedefforward_to_rabbitmq(queue_name, item):
connection, channel=connect_rabbitmq([queue_name])
channel.basic_publish(...)
connection.close()
# After: shared, long-lived connection that reconnects on demandforward_to_rabbitmq("upload_queue", item) # -> _publisher.publish(...)

Publishers and consumers use separate connections (recommended by RabbitMQ), and all reconnect automatically, eliminating the connection churn.

CopilotAI linked an issue Jul 2, 2026 that may be closed by this pull request
2 tasks
CopilotAI changed the title [WIP] Fix RabbitMQ connection handling by preserving the connectionUnify RabbitMQ handling with persistent, auto-reconnecting connectionsJul 2, 2026
CopilotAI requested a review from maxi07July 2, 2026 15:17
@maxi07
maxi07 requested a review from CopilotJuly 2, 2026 16:11

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR centralizes RabbitMQ connectivity into scansynclib to eliminate per-message connection churn and missed-heartbeat disconnects across ScanSync’s microservices, improving reliability for long-running OCR/upload/naming workloads and SSE updates.

Changes:

  • Introduces a unified RabbitMQClient + helper API in scansynclib.rabbitmq with long-lived, auto-reconnecting publish/consume patterns (and a backward-compatible connect_rabbitmq).
  • Refactors services to consume/publish via the shared helpers instead of duplicating connect/reconnect logic.
  • Adds focused unit tests for connection reuse and reconnect behavior.

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 5 comments.

Show a summary per file
FileDescription
web_service/src/main.pyKeeps SSE RabbitMQ listener thread alive via reconnect loop.
upload_service/main.pySwitches upload consumer to unified consume(...) helper.
ocr_service/main.pySwitches OCR consumer to unified consume(...) helper.
metadata_service/main.pyPublishes to OCR queue via unified publish(...) and consumes via consume(...).
file_naming_service/main.pySwitches consumer to unified consume(...) and changes ack/reconnect behavior.
detection_service/main.pyUses RabbitMQClient + process_events() to keep a single connection alive between scans.
scansynclib/scansynclib/rabbitmq.pyNew unified, reconnecting RabbitMQ connection/publish/consume implementation.
scansynclib/scansynclib/helpers.pyRe-exports RabbitMQ helpers for backward-compatible imports.
scansynclib/scansynclib/sqlite_wrapper.pyRoutes SSE publish through unified exchange publisher helper.
tests/test_rabbitmq.pyAdds tests covering connection reuse and reconnect logic.
scansynclib/scansynclib.egg-info/SOURCES.txtUpdates packaged file list (currently introduces duplicates).

Comment on lines +103 to +119
connection, channel = result

try:
# Use fanout as exchange type to broadcast messages to all connected clients
channel.exchange_declare(exchange=exchange_name, exchange_type='fanout')
queue_result = channel.queue_declare(queue='', exclusive=True)
queue_name = queue_result.method.queue
channel.queue_bind(exchange=exchange_name, queue=queue_name)

channel.basic_consume(queue=queue_name, on_message_callback=callback, auto_ack=True)
channel.start_consuming()
except pika.exceptions.AMQPError as e:
logger.error(f"RabbitMQ SSE listener connection lost: {e}. Reconnecting in 5 seconds...")
time.sleep(5)
except Exception as e:
logger.exception(f"Unexpected error in SSE listener: {e}. Reconnecting in 5 seconds...")
time.sleep(5)
Comment threadscansynclib/scansynclib/rabbitmq.py Outdated
Comment on lines +158 to +168
def declare_queue(self, queue_name: str, durable: bool = True):
if not queue_name or queue_name in self._declared_queues:
return
self._channel.queue_declare(queue=queue_name, durable=durable)
self._declared_queues.add(queue_name)

def declare_exchange(self, exchange: str, exchange_type: str = "fanout"):
if not exchange or exchange in self._declared_exchanges:
return
self._channel.exchange_declare(exchange=exchange, exchange_type=exchange_type)
self._declared_exchanges.add(exchange)
Comment on lines +92 to +94
client = RabbitMQClient(name="detection")
client.ensure_connection()
client.declare_queue(RABBITQUEUE)
Comment on lines 95 to +99
ch.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPConnectionError:
logger.error("Connection lost while acknowledging message. Reconnecting...")
connection, channel = connect_rabbitmq([RABBITQUEUE], heartbeat=120)
channel.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPError:
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")
Comment on lines +14 to +25
scansynclib/ProcessItem.py
scansynclib/__init__.py
scansynclib/config.py
scansynclib/helpers.py
scansynclib/logging.py
scansynclib/ollama_helper.py
scansynclib/onedrive_api.py
scansynclib/onedrive_smb_manager.py
scansynclib/openai_helper.py
scansynclib/settings.py
scansynclib/settings_schema.py
scansynclib/sqlite_wrapper.py
@maxi07

Copy link
Copy Markdown
Owner

remember to update rabbitmq as well.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 11 out of 11 changed files in this pull request and generated 3 comments.

Comment threadfile_naming_service/main.py Outdated
Comment on lines +99 to +103
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")
if not acknowledged:
return
Comment on lines +282 to +284
_publisher = RabbitMQClient(name="publisher")
_publisher_lock = threading.Lock()

Comment on lines +4 to +8
scansynclib/config.py
scansynclib/helpers.py
scansynclib/logging.py
scansynclib/ollama_helper.py
scansynclib/onedrive_api.py

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.

Comment on lines 94 to +99
try:
ch.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPConnectionError:
logger.error("Connection lost while acknowledging message. Reconnecting...")
connection, channel = connect_rabbitmq([RABBITQUEUE], heartbeat=120)
channel.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPError:
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in commit a3aebb8. The finally block now tracks ack_ok and only proceeds with DB updates and upload_queue forwarding when the ack succeeded. The test was also updated to verify that these follow-up actions are skipped on ack failure.

@maxi07
maxi07 marked this pull request as ready for review July 4, 2026 12:09
@maxi07

Copy link
Copy Markdown
Owner

@copilot resolve the merge conflicts in this pull request

Resolve conflicts:
- detection_service/main.py: keep RabbitMQClient setup, add cleanup_dangling_documents() from main
- upload_service/main.py: keep consume() from helpers, add execute_query import from main

CopilotAI commented Jul 4, 2026

Copy link
Copy Markdown
ContributorAuthor

@copilot resolve the merge conflicts in this pull request

Resolved in merge commit 2bb5f61. The two conflicts were:

@maxi07
maxi07 merged commit c9c60ed into mainJul 4, 2026
3 checks passed
@maxi07
maxi07 deleted the copilot/handle-rabbitmq-connection branch July 4, 2026 12:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

RabbitMQ is not used properly

3 participants

@maxi07
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Unify RabbitMQ handling with persistent, auto-reconnecting connections - #70

Merged
maxi07 merged 11 commits into
mainfrom
copilot/handle-rabbitmq-connection
Jul 4, 2026
Merged

Unify RabbitMQ handling with persistent, auto-reconnecting connections#70
maxi07 merged 11 commits into
mainfrom
copilot/handle-rabbitmq-connection

Conversation

CopilotAI commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

Services each built their own RabbitMQ connections and rebuilt them constantly, so the broker dropped clients with missed heartbeats from client, timeout: 60s. The goal: establish connections once, keep them alive, and centralize the logic.

Root cause

  • sqlite_wrapper opened the SSE publisher with the default 60s heartbeat and never serviced it during long OCR/upload/naming work → broker closed it every ~60s.
  • forward_to_rabbitmq opened and closed a new connection per message.
  • Every service duplicated its own connect/reconnect loop.

Changes

  • New scansynclib/rabbitmq.py — single source of truth for messaging:
    • RabbitMQClient: wraps one long-lived BlockingConnection, lazily connects, re-declares queues/exchanges after a reconnect, and transparently reconnects on publish/consume failures (default heartbeat 600s).
    • Helpers: publish, forward_to_rabbitmq (shared publisher connection), publish_to_exchange, consume (unified reconnecting consumer loop), process_events (heartbeat servicing for polling publishers), and a backward-compatible connect_rabbitmq.
  • helpers.py re-exports these so existing imports keep working.
  • sqlite_wrapper.py — SSE notify_sse_clients now publishes through the self-healing publisher (fixes the 60s drops).
  • Services refactored — OCR / file_naming / upload / metadata consume via consume(...); metadata publishes to ocr_queue via publish(...); detection uses RabbitMQClient + process_events; the web SSE listener reconnects instead of killing its thread. file_naming's fragile manual re-ack was dropped (broker redelivers after reconnect).
  • tests/test_rabbitmq.py — covers connection reuse, reconnect on StreamLostError, publish-failure handling, exchange declaration, pickling in forward_to_rabbitmq, and consumer reconnection.

Before → after

# Before: new connection opened and torn down for every messagedefforward_to_rabbitmq(queue_name, item):
connection, channel=connect_rabbitmq([queue_name])
channel.basic_publish(...)
connection.close()
# After: shared, long-lived connection that reconnects on demandforward_to_rabbitmq("upload_queue", item) # -> _publisher.publish(...)

Publishers and consumers use separate connections (recommended by RabbitMQ), and all reconnect automatically, eliminating the connection churn.

CopilotAI linked an issue Jul 2, 2026 that may be closed by this pull request
2 tasks
CopilotAI changed the title [WIP] Fix RabbitMQ connection handling by preserving the connectionUnify RabbitMQ handling with persistent, auto-reconnecting connectionsJul 2, 2026
CopilotAI requested a review from maxi07July 2, 2026 15:17
@maxi07
maxi07 requested a review from CopilotJuly 2, 2026 16:11

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR centralizes RabbitMQ connectivity into scansynclib to eliminate per-message connection churn and missed-heartbeat disconnects across ScanSync’s microservices, improving reliability for long-running OCR/upload/naming workloads and SSE updates.

Changes:

  • Introduces a unified RabbitMQClient + helper API in scansynclib.rabbitmq with long-lived, auto-reconnecting publish/consume patterns (and a backward-compatible connect_rabbitmq).
  • Refactors services to consume/publish via the shared helpers instead of duplicating connect/reconnect logic.
  • Adds focused unit tests for connection reuse and reconnect behavior.

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 5 comments.

Show a summary per file
FileDescription
web_service/src/main.pyKeeps SSE RabbitMQ listener thread alive via reconnect loop.
upload_service/main.pySwitches upload consumer to unified consume(...) helper.
ocr_service/main.pySwitches OCR consumer to unified consume(...) helper.
metadata_service/main.pyPublishes to OCR queue via unified publish(...) and consumes via consume(...).
file_naming_service/main.pySwitches consumer to unified consume(...) and changes ack/reconnect behavior.
detection_service/main.pyUses RabbitMQClient + process_events() to keep a single connection alive between scans.
scansynclib/scansynclib/rabbitmq.pyNew unified, reconnecting RabbitMQ connection/publish/consume implementation.
scansynclib/scansynclib/helpers.pyRe-exports RabbitMQ helpers for backward-compatible imports.
scansynclib/scansynclib/sqlite_wrapper.pyRoutes SSE publish through unified exchange publisher helper.
tests/test_rabbitmq.pyAdds tests covering connection reuse and reconnect logic.
scansynclib/scansynclib.egg-info/SOURCES.txtUpdates packaged file list (currently introduces duplicates).

Comment on lines +103 to +119
connection, channel = result

try:
# Use fanout as exchange type to broadcast messages to all connected clients
channel.exchange_declare(exchange=exchange_name, exchange_type='fanout')
queue_result = channel.queue_declare(queue='', exclusive=True)
queue_name = queue_result.method.queue
channel.queue_bind(exchange=exchange_name, queue=queue_name)

channel.basic_consume(queue=queue_name, on_message_callback=callback, auto_ack=True)
channel.start_consuming()
except pika.exceptions.AMQPError as e:
logger.error(f"RabbitMQ SSE listener connection lost: {e}. Reconnecting in 5 seconds...")
time.sleep(5)
except Exception as e:
logger.exception(f"Unexpected error in SSE listener: {e}. Reconnecting in 5 seconds...")
time.sleep(5)
Comment threadscansynclib/scansynclib/rabbitmq.py Outdated
Comment on lines +158 to +168
def declare_queue(self, queue_name: str, durable: bool = True):
if not queue_name or queue_name in self._declared_queues:
return
self._channel.queue_declare(queue=queue_name, durable=durable)
self._declared_queues.add(queue_name)

def declare_exchange(self, exchange: str, exchange_type: str = "fanout"):
if not exchange or exchange in self._declared_exchanges:
return
self._channel.exchange_declare(exchange=exchange, exchange_type=exchange_type)
self._declared_exchanges.add(exchange)
Comment on lines +92 to +94
client = RabbitMQClient(name="detection")
client.ensure_connection()
client.declare_queue(RABBITQUEUE)
Comment on lines 95 to +99
ch.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPConnectionError:
logger.error("Connection lost while acknowledging message. Reconnecting...")
connection, channel = connect_rabbitmq([RABBITQUEUE], heartbeat=120)
channel.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPError:
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")
Comment on lines +14 to +25
scansynclib/ProcessItem.py
scansynclib/__init__.py
scansynclib/config.py
scansynclib/helpers.py
scansynclib/logging.py
scansynclib/ollama_helper.py
scansynclib/onedrive_api.py
scansynclib/onedrive_smb_manager.py
scansynclib/openai_helper.py
scansynclib/settings.py
scansynclib/settings_schema.py
scansynclib/sqlite_wrapper.py
@maxi07

Copy link
Copy Markdown
Owner

remember to update rabbitmq as well.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 11 out of 11 changed files in this pull request and generated 3 comments.

Comment threadfile_naming_service/main.py Outdated
Comment on lines +99 to +103
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")
if not acknowledged:
return
Comment on lines +282 to +284
_publisher = RabbitMQClient(name="publisher")
_publisher_lock = threading.Lock()

Comment on lines +4 to +8
scansynclib/config.py
scansynclib/helpers.py
scansynclib/logging.py
scansynclib/ollama_helper.py
scansynclib/onedrive_api.py

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.

Comment on lines 94 to +99
try:
ch.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPConnectionError:
logger.error("Connection lost while acknowledging message. Reconnecting...")
connection, channel = connect_rabbitmq([RABBITQUEUE], heartbeat=120)
channel.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPError:
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in commit a3aebb8. The finally block now tracks ack_ok and only proceeds with DB updates and upload_queue forwarding when the ack succeeded. The test was also updated to verify that these follow-up actions are skipped on ack failure.

@maxi07
maxi07 marked this pull request as ready for review July 4, 2026 12:09
@maxi07

Copy link
Copy Markdown
Owner

@copilot resolve the merge conflicts in this pull request

Resolve conflicts:
- detection_service/main.py: keep RabbitMQClient setup, add cleanup_dangling_documents() from main
- upload_service/main.py: keep consume() from helpers, add execute_query import from main

CopilotAI commented Jul 4, 2026

Copy link
Copy Markdown
ContributorAuthor

@copilot resolve the merge conflicts in this pull request

Resolved in merge commit 2bb5f61. The two conflicts were:

@maxi07
maxi07 merged commit c9c60ed into mainJul 4, 2026
3 checks passed
@maxi07
maxi07 deleted the copilot/handle-rabbitmq-connection branch July 4, 2026 12:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

RabbitMQ is not used properly

3 participants

@maxi07
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Unify RabbitMQ handling with persistent, auto-reconnecting connections - #70

Merged
maxi07 merged 11 commits into
mainfrom
copilot/handle-rabbitmq-connection
Jul 4, 2026
Merged

Unify RabbitMQ handling with persistent, auto-reconnecting connections#70
maxi07 merged 11 commits into
mainfrom
copilot/handle-rabbitmq-connection

Conversation

CopilotAI commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

Services each built their own RabbitMQ connections and rebuilt them constantly, so the broker dropped clients with missed heartbeats from client, timeout: 60s. The goal: establish connections once, keep them alive, and centralize the logic.

Root cause

  • sqlite_wrapper opened the SSE publisher with the default 60s heartbeat and never serviced it during long OCR/upload/naming work → broker closed it every ~60s.
  • forward_to_rabbitmq opened and closed a new connection per message.
  • Every service duplicated its own connect/reconnect loop.

Changes

  • New scansynclib/rabbitmq.py — single source of truth for messaging:
    • RabbitMQClient: wraps one long-lived BlockingConnection, lazily connects, re-declares queues/exchanges after a reconnect, and transparently reconnects on publish/consume failures (default heartbeat 600s).
    • Helpers: publish, forward_to_rabbitmq (shared publisher connection), publish_to_exchange, consume (unified reconnecting consumer loop), process_events (heartbeat servicing for polling publishers), and a backward-compatible connect_rabbitmq.
  • helpers.py re-exports these so existing imports keep working.
  • sqlite_wrapper.py — SSE notify_sse_clients now publishes through the self-healing publisher (fixes the 60s drops).
  • Services refactored — OCR / file_naming / upload / metadata consume via consume(...); metadata publishes to ocr_queue via publish(...); detection uses RabbitMQClient + process_events; the web SSE listener reconnects instead of killing its thread. file_naming's fragile manual re-ack was dropped (broker redelivers after reconnect).
  • tests/test_rabbitmq.py — covers connection reuse, reconnect on StreamLostError, publish-failure handling, exchange declaration, pickling in forward_to_rabbitmq, and consumer reconnection.

Before → after

# Before: new connection opened and torn down for every messagedefforward_to_rabbitmq(queue_name, item):
connection, channel=connect_rabbitmq([queue_name])
channel.basic_publish(...)
connection.close()
# After: shared, long-lived connection that reconnects on demandforward_to_rabbitmq("upload_queue", item) # -> _publisher.publish(...)

Publishers and consumers use separate connections (recommended by RabbitMQ), and all reconnect automatically, eliminating the connection churn.

CopilotAI linked an issue Jul 2, 2026 that may be closed by this pull request
2 tasks
CopilotAI changed the title [WIP] Fix RabbitMQ connection handling by preserving the connectionUnify RabbitMQ handling with persistent, auto-reconnecting connectionsJul 2, 2026
CopilotAI requested a review from maxi07July 2, 2026 15:17
@maxi07
maxi07 requested a review from CopilotJuly 2, 2026 16:11

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR centralizes RabbitMQ connectivity into scansynclib to eliminate per-message connection churn and missed-heartbeat disconnects across ScanSync’s microservices, improving reliability for long-running OCR/upload/naming workloads and SSE updates.

Changes:

  • Introduces a unified RabbitMQClient + helper API in scansynclib.rabbitmq with long-lived, auto-reconnecting publish/consume patterns (and a backward-compatible connect_rabbitmq).
  • Refactors services to consume/publish via the shared helpers instead of duplicating connect/reconnect logic.
  • Adds focused unit tests for connection reuse and reconnect behavior.

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 5 comments.

Show a summary per file
FileDescription
web_service/src/main.pyKeeps SSE RabbitMQ listener thread alive via reconnect loop.
upload_service/main.pySwitches upload consumer to unified consume(...) helper.
ocr_service/main.pySwitches OCR consumer to unified consume(...) helper.
metadata_service/main.pyPublishes to OCR queue via unified publish(...) and consumes via consume(...).
file_naming_service/main.pySwitches consumer to unified consume(...) and changes ack/reconnect behavior.
detection_service/main.pyUses RabbitMQClient + process_events() to keep a single connection alive between scans.
scansynclib/scansynclib/rabbitmq.pyNew unified, reconnecting RabbitMQ connection/publish/consume implementation.
scansynclib/scansynclib/helpers.pyRe-exports RabbitMQ helpers for backward-compatible imports.
scansynclib/scansynclib/sqlite_wrapper.pyRoutes SSE publish through unified exchange publisher helper.
tests/test_rabbitmq.pyAdds tests covering connection reuse and reconnect logic.
scansynclib/scansynclib.egg-info/SOURCES.txtUpdates packaged file list (currently introduces duplicates).

Comment on lines +103 to +119
connection, channel = result

try:
# Use fanout as exchange type to broadcast messages to all connected clients
channel.exchange_declare(exchange=exchange_name, exchange_type='fanout')
queue_result = channel.queue_declare(queue='', exclusive=True)
queue_name = queue_result.method.queue
channel.queue_bind(exchange=exchange_name, queue=queue_name)

channel.basic_consume(queue=queue_name, on_message_callback=callback, auto_ack=True)
channel.start_consuming()
except pika.exceptions.AMQPError as e:
logger.error(f"RabbitMQ SSE listener connection lost: {e}. Reconnecting in 5 seconds...")
time.sleep(5)
except Exception as e:
logger.exception(f"Unexpected error in SSE listener: {e}. Reconnecting in 5 seconds...")
time.sleep(5)
Comment threadscansynclib/scansynclib/rabbitmq.py Outdated
Comment on lines +158 to +168
def declare_queue(self, queue_name: str, durable: bool = True):
if not queue_name or queue_name in self._declared_queues:
return
self._channel.queue_declare(queue=queue_name, durable=durable)
self._declared_queues.add(queue_name)

def declare_exchange(self, exchange: str, exchange_type: str = "fanout"):
if not exchange or exchange in self._declared_exchanges:
return
self._channel.exchange_declare(exchange=exchange, exchange_type=exchange_type)
self._declared_exchanges.add(exchange)
Comment on lines +92 to +94
client = RabbitMQClient(name="detection")
client.ensure_connection()
client.declare_queue(RABBITQUEUE)
Comment on lines 95 to +99
ch.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPConnectionError:
logger.error("Connection lost while acknowledging message. Reconnecting...")
connection, channel = connect_rabbitmq([RABBITQUEUE], heartbeat=120)
channel.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPError:
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")
Comment on lines +14 to +25
scansynclib/ProcessItem.py
scansynclib/__init__.py
scansynclib/config.py
scansynclib/helpers.py
scansynclib/logging.py
scansynclib/ollama_helper.py
scansynclib/onedrive_api.py
scansynclib/onedrive_smb_manager.py
scansynclib/openai_helper.py
scansynclib/settings.py
scansynclib/settings_schema.py
scansynclib/sqlite_wrapper.py
@maxi07

Copy link
Copy Markdown
Owner

remember to update rabbitmq as well.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 11 out of 11 changed files in this pull request and generated 3 comments.

Comment threadfile_naming_service/main.py Outdated
Comment on lines +99 to +103
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")
if not acknowledged:
return
Comment on lines +282 to +284
_publisher = RabbitMQClient(name="publisher")
_publisher_lock = threading.Lock()

Comment on lines +4 to +8
scansynclib/config.py
scansynclib/helpers.py
scansynclib/logging.py
scansynclib/ollama_helper.py
scansynclib/onedrive_api.py

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.

Comment on lines 94 to +99
try:
ch.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPConnectionError:
logger.error("Connection lost while acknowledging message. Reconnecting...")
connection, channel = connect_rabbitmq([RABBITQUEUE], heartbeat=120)
channel.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPError:
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in commit a3aebb8. The finally block now tracks ack_ok and only proceeds with DB updates and upload_queue forwarding when the ack succeeded. The test was also updated to verify that these follow-up actions are skipped on ack failure.

@maxi07
maxi07 marked this pull request as ready for review July 4, 2026 12:09
@maxi07

Copy link
Copy Markdown
Owner

@copilot resolve the merge conflicts in this pull request

Resolve conflicts:
- detection_service/main.py: keep RabbitMQClient setup, add cleanup_dangling_documents() from main
- upload_service/main.py: keep consume() from helpers, add execute_query import from main

CopilotAI commented Jul 4, 2026

Copy link
Copy Markdown
ContributorAuthor

@copilot resolve the merge conflicts in this pull request

Resolved in merge commit 2bb5f61. The two conflicts were:

@maxi07
maxi07 merged commit c9c60ed into mainJul 4, 2026
3 checks passed
@maxi07
maxi07 deleted the copilot/handle-rabbitmq-connection branch July 4, 2026 12:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

RabbitMQ is not used properly

3 participants

@maxi07
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Unify RabbitMQ handling with persistent, auto-reconnecting connections - #70

Merged
maxi07 merged 11 commits into
mainfrom
copilot/handle-rabbitmq-connection
Jul 4, 2026
Merged

Unify RabbitMQ handling with persistent, auto-reconnecting connections#70
maxi07 merged 11 commits into
mainfrom
copilot/handle-rabbitmq-connection

Conversation

CopilotAI commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

Services each built their own RabbitMQ connections and rebuilt them constantly, so the broker dropped clients with missed heartbeats from client, timeout: 60s. The goal: establish connections once, keep them alive, and centralize the logic.

Root cause

  • sqlite_wrapper opened the SSE publisher with the default 60s heartbeat and never serviced it during long OCR/upload/naming work → broker closed it every ~60s.
  • forward_to_rabbitmq opened and closed a new connection per message.
  • Every service duplicated its own connect/reconnect loop.

Changes

  • New scansynclib/rabbitmq.py — single source of truth for messaging:
    • RabbitMQClient: wraps one long-lived BlockingConnection, lazily connects, re-declares queues/exchanges after a reconnect, and transparently reconnects on publish/consume failures (default heartbeat 600s).
    • Helpers: publish, forward_to_rabbitmq (shared publisher connection), publish_to_exchange, consume (unified reconnecting consumer loop), process_events (heartbeat servicing for polling publishers), and a backward-compatible connect_rabbitmq.
  • helpers.py re-exports these so existing imports keep working.
  • sqlite_wrapper.py — SSE notify_sse_clients now publishes through the self-healing publisher (fixes the 60s drops).
  • Services refactored — OCR / file_naming / upload / metadata consume via consume(...); metadata publishes to ocr_queue via publish(...); detection uses RabbitMQClient + process_events; the web SSE listener reconnects instead of killing its thread. file_naming's fragile manual re-ack was dropped (broker redelivers after reconnect).
  • tests/test_rabbitmq.py — covers connection reuse, reconnect on StreamLostError, publish-failure handling, exchange declaration, pickling in forward_to_rabbitmq, and consumer reconnection.

Before → after

# Before: new connection opened and torn down for every messagedefforward_to_rabbitmq(queue_name, item):
connection, channel=connect_rabbitmq([queue_name])
channel.basic_publish(...)
connection.close()
# After: shared, long-lived connection that reconnects on demandforward_to_rabbitmq("upload_queue", item) # -> _publisher.publish(...)

Publishers and consumers use separate connections (recommended by RabbitMQ), and all reconnect automatically, eliminating the connection churn.

CopilotAI linked an issue Jul 2, 2026 that may be closed by this pull request
2 tasks
CopilotAI changed the title [WIP] Fix RabbitMQ connection handling by preserving the connectionUnify RabbitMQ handling with persistent, auto-reconnecting connectionsJul 2, 2026
CopilotAI requested a review from maxi07July 2, 2026 15:17
@maxi07
maxi07 requested a review from CopilotJuly 2, 2026 16:11

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR centralizes RabbitMQ connectivity into scansynclib to eliminate per-message connection churn and missed-heartbeat disconnects across ScanSync’s microservices, improving reliability for long-running OCR/upload/naming workloads and SSE updates.

Changes:

  • Introduces a unified RabbitMQClient + helper API in scansynclib.rabbitmq with long-lived, auto-reconnecting publish/consume patterns (and a backward-compatible connect_rabbitmq).
  • Refactors services to consume/publish via the shared helpers instead of duplicating connect/reconnect logic.
  • Adds focused unit tests for connection reuse and reconnect behavior.

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 5 comments.

Show a summary per file
FileDescription
web_service/src/main.pyKeeps SSE RabbitMQ listener thread alive via reconnect loop.
upload_service/main.pySwitches upload consumer to unified consume(...) helper.
ocr_service/main.pySwitches OCR consumer to unified consume(...) helper.
metadata_service/main.pyPublishes to OCR queue via unified publish(...) and consumes via consume(...).
file_naming_service/main.pySwitches consumer to unified consume(...) and changes ack/reconnect behavior.
detection_service/main.pyUses RabbitMQClient + process_events() to keep a single connection alive between scans.
scansynclib/scansynclib/rabbitmq.pyNew unified, reconnecting RabbitMQ connection/publish/consume implementation.
scansynclib/scansynclib/helpers.pyRe-exports RabbitMQ helpers for backward-compatible imports.
scansynclib/scansynclib/sqlite_wrapper.pyRoutes SSE publish through unified exchange publisher helper.
tests/test_rabbitmq.pyAdds tests covering connection reuse and reconnect logic.
scansynclib/scansynclib.egg-info/SOURCES.txtUpdates packaged file list (currently introduces duplicates).

Comment on lines +103 to +119
connection, channel = result

try:
# Use fanout as exchange type to broadcast messages to all connected clients
channel.exchange_declare(exchange=exchange_name, exchange_type='fanout')
queue_result = channel.queue_declare(queue='', exclusive=True)
queue_name = queue_result.method.queue
channel.queue_bind(exchange=exchange_name, queue=queue_name)

channel.basic_consume(queue=queue_name, on_message_callback=callback, auto_ack=True)
channel.start_consuming()
except pika.exceptions.AMQPError as e:
logger.error(f"RabbitMQ SSE listener connection lost: {e}. Reconnecting in 5 seconds...")
time.sleep(5)
except Exception as e:
logger.exception(f"Unexpected error in SSE listener: {e}. Reconnecting in 5 seconds...")
time.sleep(5)
Comment threadscansynclib/scansynclib/rabbitmq.py Outdated
Comment on lines +158 to +168
def declare_queue(self, queue_name: str, durable: bool = True):
if not queue_name or queue_name in self._declared_queues:
return
self._channel.queue_declare(queue=queue_name, durable=durable)
self._declared_queues.add(queue_name)

def declare_exchange(self, exchange: str, exchange_type: str = "fanout"):
if not exchange or exchange in self._declared_exchanges:
return
self._channel.exchange_declare(exchange=exchange, exchange_type=exchange_type)
self._declared_exchanges.add(exchange)
Comment on lines +92 to +94
client = RabbitMQClient(name="detection")
client.ensure_connection()
client.declare_queue(RABBITQUEUE)
Comment on lines 95 to +99
ch.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPConnectionError:
logger.error("Connection lost while acknowledging message. Reconnecting...")
connection, channel = connect_rabbitmq([RABBITQUEUE], heartbeat=120)
channel.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPError:
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")
Comment on lines +14 to +25
scansynclib/ProcessItem.py
scansynclib/__init__.py
scansynclib/config.py
scansynclib/helpers.py
scansynclib/logging.py
scansynclib/ollama_helper.py
scansynclib/onedrive_api.py
scansynclib/onedrive_smb_manager.py
scansynclib/openai_helper.py
scansynclib/settings.py
scansynclib/settings_schema.py
scansynclib/sqlite_wrapper.py
@maxi07

Copy link
Copy Markdown
Owner

remember to update rabbitmq as well.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 11 out of 11 changed files in this pull request and generated 3 comments.

Comment threadfile_naming_service/main.py Outdated
Comment on lines +99 to +103
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")
if not acknowledged:
return
Comment on lines +282 to +284
_publisher = RabbitMQClient(name="publisher")
_publisher_lock = threading.Lock()

Comment on lines +4 to +8
scansynclib/config.py
scansynclib/helpers.py
scansynclib/logging.py
scansynclib/ollama_helper.py
scansynclib/onedrive_api.py

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.

Comment on lines 94 to +99
try:
ch.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPConnectionError:
logger.error("Connection lost while acknowledging message. Reconnecting...")
connection, channel = connect_rabbitmq([RABBITQUEUE], heartbeat=120)
channel.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPError:
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in commit a3aebb8. The finally block now tracks ack_ok and only proceeds with DB updates and upload_queue forwarding when the ack succeeded. The test was also updated to verify that these follow-up actions are skipped on ack failure.

@maxi07
maxi07 marked this pull request as ready for review July 4, 2026 12:09
@maxi07

Copy link
Copy Markdown
Owner

@copilot resolve the merge conflicts in this pull request

Resolve conflicts:
- detection_service/main.py: keep RabbitMQClient setup, add cleanup_dangling_documents() from main
- upload_service/main.py: keep consume() from helpers, add execute_query import from main

CopilotAI commented Jul 4, 2026

Copy link
Copy Markdown
ContributorAuthor

@copilot resolve the merge conflicts in this pull request

Resolved in merge commit 2bb5f61. The two conflicts were:

@maxi07
maxi07 merged commit c9c60ed into mainJul 4, 2026
3 checks passed
@maxi07
maxi07 deleted the copilot/handle-rabbitmq-connection branch July 4, 2026 12:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

RabbitMQ is not used properly

3 participants

@maxi07
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Unify RabbitMQ handling with persistent, auto-reconnecting connections - #70

Merged
maxi07 merged 11 commits into
mainfrom
copilot/handle-rabbitmq-connection
Jul 4, 2026
Merged

Unify RabbitMQ handling with persistent, auto-reconnecting connections#70
maxi07 merged 11 commits into
mainfrom
copilot/handle-rabbitmq-connection

Conversation

CopilotAI commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

Services each built their own RabbitMQ connections and rebuilt them constantly, so the broker dropped clients with missed heartbeats from client, timeout: 60s. The goal: establish connections once, keep them alive, and centralize the logic.

Root cause

  • sqlite_wrapper opened the SSE publisher with the default 60s heartbeat and never serviced it during long OCR/upload/naming work → broker closed it every ~60s.
  • forward_to_rabbitmq opened and closed a new connection per message.
  • Every service duplicated its own connect/reconnect loop.

Changes

  • New scansynclib/rabbitmq.py — single source of truth for messaging:
    • RabbitMQClient: wraps one long-lived BlockingConnection, lazily connects, re-declares queues/exchanges after a reconnect, and transparently reconnects on publish/consume failures (default heartbeat 600s).
    • Helpers: publish, forward_to_rabbitmq (shared publisher connection), publish_to_exchange, consume (unified reconnecting consumer loop), process_events (heartbeat servicing for polling publishers), and a backward-compatible connect_rabbitmq.
  • helpers.py re-exports these so existing imports keep working.
  • sqlite_wrapper.py — SSE notify_sse_clients now publishes through the self-healing publisher (fixes the 60s drops).
  • Services refactored — OCR / file_naming / upload / metadata consume via consume(...); metadata publishes to ocr_queue via publish(...); detection uses RabbitMQClient + process_events; the web SSE listener reconnects instead of killing its thread. file_naming's fragile manual re-ack was dropped (broker redelivers after reconnect).
  • tests/test_rabbitmq.py — covers connection reuse, reconnect on StreamLostError, publish-failure handling, exchange declaration, pickling in forward_to_rabbitmq, and consumer reconnection.

Before → after

# Before: new connection opened and torn down for every messagedefforward_to_rabbitmq(queue_name, item):
connection, channel=connect_rabbitmq([queue_name])
channel.basic_publish(...)
connection.close()
# After: shared, long-lived connection that reconnects on demandforward_to_rabbitmq("upload_queue", item) # -> _publisher.publish(...)

Publishers and consumers use separate connections (recommended by RabbitMQ), and all reconnect automatically, eliminating the connection churn.

CopilotAI linked an issue Jul 2, 2026 that may be closed by this pull request
2 tasks
CopilotAI changed the title [WIP] Fix RabbitMQ connection handling by preserving the connectionUnify RabbitMQ handling with persistent, auto-reconnecting connectionsJul 2, 2026
CopilotAI requested a review from maxi07July 2, 2026 15:17
@maxi07
maxi07 requested a review from CopilotJuly 2, 2026 16:11

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR centralizes RabbitMQ connectivity into scansynclib to eliminate per-message connection churn and missed-heartbeat disconnects across ScanSync’s microservices, improving reliability for long-running OCR/upload/naming workloads and SSE updates.

Changes:

  • Introduces a unified RabbitMQClient + helper API in scansynclib.rabbitmq with long-lived, auto-reconnecting publish/consume patterns (and a backward-compatible connect_rabbitmq).
  • Refactors services to consume/publish via the shared helpers instead of duplicating connect/reconnect logic.
  • Adds focused unit tests for connection reuse and reconnect behavior.

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 5 comments.

Show a summary per file
FileDescription
web_service/src/main.pyKeeps SSE RabbitMQ listener thread alive via reconnect loop.
upload_service/main.pySwitches upload consumer to unified consume(...) helper.
ocr_service/main.pySwitches OCR consumer to unified consume(...) helper.
metadata_service/main.pyPublishes to OCR queue via unified publish(...) and consumes via consume(...).
file_naming_service/main.pySwitches consumer to unified consume(...) and changes ack/reconnect behavior.
detection_service/main.pyUses RabbitMQClient + process_events() to keep a single connection alive between scans.
scansynclib/scansynclib/rabbitmq.pyNew unified, reconnecting RabbitMQ connection/publish/consume implementation.
scansynclib/scansynclib/helpers.pyRe-exports RabbitMQ helpers for backward-compatible imports.
scansynclib/scansynclib/sqlite_wrapper.pyRoutes SSE publish through unified exchange publisher helper.
tests/test_rabbitmq.pyAdds tests covering connection reuse and reconnect logic.
scansynclib/scansynclib.egg-info/SOURCES.txtUpdates packaged file list (currently introduces duplicates).

Comment on lines +103 to +119
connection, channel = result

try:
# Use fanout as exchange type to broadcast messages to all connected clients
channel.exchange_declare(exchange=exchange_name, exchange_type='fanout')
queue_result = channel.queue_declare(queue='', exclusive=True)
queue_name = queue_result.method.queue
channel.queue_bind(exchange=exchange_name, queue=queue_name)

channel.basic_consume(queue=queue_name, on_message_callback=callback, auto_ack=True)
channel.start_consuming()
except pika.exceptions.AMQPError as e:
logger.error(f"RabbitMQ SSE listener connection lost: {e}. Reconnecting in 5 seconds...")
time.sleep(5)
except Exception as e:
logger.exception(f"Unexpected error in SSE listener: {e}. Reconnecting in 5 seconds...")
time.sleep(5)
Comment threadscansynclib/scansynclib/rabbitmq.py Outdated
Comment on lines +158 to +168
def declare_queue(self, queue_name: str, durable: bool = True):
if not queue_name or queue_name in self._declared_queues:
return
self._channel.queue_declare(queue=queue_name, durable=durable)
self._declared_queues.add(queue_name)

def declare_exchange(self, exchange: str, exchange_type: str = "fanout"):
if not exchange or exchange in self._declared_exchanges:
return
self._channel.exchange_declare(exchange=exchange, exchange_type=exchange_type)
self._declared_exchanges.add(exchange)
Comment on lines +92 to +94
client = RabbitMQClient(name="detection")
client.ensure_connection()
client.declare_queue(RABBITQUEUE)
Comment on lines 95 to +99
ch.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPConnectionError:
logger.error("Connection lost while acknowledging message. Reconnecting...")
connection, channel = connect_rabbitmq([RABBITQUEUE], heartbeat=120)
channel.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPError:
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")
Comment on lines +14 to +25
scansynclib/ProcessItem.py
scansynclib/__init__.py
scansynclib/config.py
scansynclib/helpers.py
scansynclib/logging.py
scansynclib/ollama_helper.py
scansynclib/onedrive_api.py
scansynclib/onedrive_smb_manager.py
scansynclib/openai_helper.py
scansynclib/settings.py
scansynclib/settings_schema.py
scansynclib/sqlite_wrapper.py
@maxi07

Copy link
Copy Markdown
Owner

remember to update rabbitmq as well.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 11 out of 11 changed files in this pull request and generated 3 comments.

Comment threadfile_naming_service/main.py Outdated
Comment on lines +99 to +103
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")
if not acknowledged:
return
Comment on lines +282 to +284
_publisher = RabbitMQClient(name="publisher")
_publisher_lock = threading.Lock()

Comment on lines +4 to +8
scansynclib/config.py
scansynclib/helpers.py
scansynclib/logging.py
scansynclib/ollama_helper.py
scansynclib/onedrive_api.py

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.

Comment on lines 94 to +99
try:
ch.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPConnectionError:
logger.error("Connection lost while acknowledging message. Reconnecting...")
connection, channel = connect_rabbitmq([RABBITQUEUE], heartbeat=120)
channel.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPError:
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in commit a3aebb8. The finally block now tracks ack_ok and only proceeds with DB updates and upload_queue forwarding when the ack succeeded. The test was also updated to verify that these follow-up actions are skipped on ack failure.

@maxi07
maxi07 marked this pull request as ready for review July 4, 2026 12:09
@maxi07

Copy link
Copy Markdown
Owner

@copilot resolve the merge conflicts in this pull request

Resolve conflicts:
- detection_service/main.py: keep RabbitMQClient setup, add cleanup_dangling_documents() from main
- upload_service/main.py: keep consume() from helpers, add execute_query import from main

CopilotAI commented Jul 4, 2026

Copy link
Copy Markdown
ContributorAuthor

@copilot resolve the merge conflicts in this pull request

Resolved in merge commit 2bb5f61. The two conflicts were:

@maxi07
maxi07 merged commit c9c60ed into mainJul 4, 2026
3 checks passed
@maxi07
maxi07 deleted the copilot/handle-rabbitmq-connection branch July 4, 2026 12:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

RabbitMQ is not used properly

3 participants

@maxi07
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Unify RabbitMQ handling with persistent, auto-reconnecting connections - #70

Merged
maxi07 merged 11 commits into
mainfrom
copilot/handle-rabbitmq-connection
Jul 4, 2026
Merged

Unify RabbitMQ handling with persistent, auto-reconnecting connections#70
maxi07 merged 11 commits into
mainfrom
copilot/handle-rabbitmq-connection

Conversation

CopilotAI commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

Services each built their own RabbitMQ connections and rebuilt them constantly, so the broker dropped clients with missed heartbeats from client, timeout: 60s. The goal: establish connections once, keep them alive, and centralize the logic.

Root cause

  • sqlite_wrapper opened the SSE publisher with the default 60s heartbeat and never serviced it during long OCR/upload/naming work → broker closed it every ~60s.
  • forward_to_rabbitmq opened and closed a new connection per message.
  • Every service duplicated its own connect/reconnect loop.

Changes

  • New scansynclib/rabbitmq.py — single source of truth for messaging:
    • RabbitMQClient: wraps one long-lived BlockingConnection, lazily connects, re-declares queues/exchanges after a reconnect, and transparently reconnects on publish/consume failures (default heartbeat 600s).
    • Helpers: publish, forward_to_rabbitmq (shared publisher connection), publish_to_exchange, consume (unified reconnecting consumer loop), process_events (heartbeat servicing for polling publishers), and a backward-compatible connect_rabbitmq.
  • helpers.py re-exports these so existing imports keep working.
  • sqlite_wrapper.py — SSE notify_sse_clients now publishes through the self-healing publisher (fixes the 60s drops).
  • Services refactored — OCR / file_naming / upload / metadata consume via consume(...); metadata publishes to ocr_queue via publish(...); detection uses RabbitMQClient + process_events; the web SSE listener reconnects instead of killing its thread. file_naming's fragile manual re-ack was dropped (broker redelivers after reconnect).
  • tests/test_rabbitmq.py — covers connection reuse, reconnect on StreamLostError, publish-failure handling, exchange declaration, pickling in forward_to_rabbitmq, and consumer reconnection.

Before → after

# Before: new connection opened and torn down for every messagedefforward_to_rabbitmq(queue_name, item):
connection, channel=connect_rabbitmq([queue_name])
channel.basic_publish(...)
connection.close()
# After: shared, long-lived connection that reconnects on demandforward_to_rabbitmq("upload_queue", item) # -> _publisher.publish(...)

Publishers and consumers use separate connections (recommended by RabbitMQ), and all reconnect automatically, eliminating the connection churn.

CopilotAI linked an issue Jul 2, 2026 that may be closed by this pull request
2 tasks
CopilotAI changed the title [WIP] Fix RabbitMQ connection handling by preserving the connectionUnify RabbitMQ handling with persistent, auto-reconnecting connectionsJul 2, 2026
CopilotAI requested a review from maxi07July 2, 2026 15:17
@maxi07
maxi07 requested a review from CopilotJuly 2, 2026 16:11

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR centralizes RabbitMQ connectivity into scansynclib to eliminate per-message connection churn and missed-heartbeat disconnects across ScanSync’s microservices, improving reliability for long-running OCR/upload/naming workloads and SSE updates.

Changes:

  • Introduces a unified RabbitMQClient + helper API in scansynclib.rabbitmq with long-lived, auto-reconnecting publish/consume patterns (and a backward-compatible connect_rabbitmq).
  • Refactors services to consume/publish via the shared helpers instead of duplicating connect/reconnect logic.
  • Adds focused unit tests for connection reuse and reconnect behavior.

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 5 comments.

Show a summary per file
FileDescription
web_service/src/main.pyKeeps SSE RabbitMQ listener thread alive via reconnect loop.
upload_service/main.pySwitches upload consumer to unified consume(...) helper.
ocr_service/main.pySwitches OCR consumer to unified consume(...) helper.
metadata_service/main.pyPublishes to OCR queue via unified publish(...) and consumes via consume(...).
file_naming_service/main.pySwitches consumer to unified consume(...) and changes ack/reconnect behavior.
detection_service/main.pyUses RabbitMQClient + process_events() to keep a single connection alive between scans.
scansynclib/scansynclib/rabbitmq.pyNew unified, reconnecting RabbitMQ connection/publish/consume implementation.
scansynclib/scansynclib/helpers.pyRe-exports RabbitMQ helpers for backward-compatible imports.
scansynclib/scansynclib/sqlite_wrapper.pyRoutes SSE publish through unified exchange publisher helper.
tests/test_rabbitmq.pyAdds tests covering connection reuse and reconnect logic.
scansynclib/scansynclib.egg-info/SOURCES.txtUpdates packaged file list (currently introduces duplicates).

Comment on lines +103 to +119
connection, channel = result

try:
# Use fanout as exchange type to broadcast messages to all connected clients
channel.exchange_declare(exchange=exchange_name, exchange_type='fanout')
queue_result = channel.queue_declare(queue='', exclusive=True)
queue_name = queue_result.method.queue
channel.queue_bind(exchange=exchange_name, queue=queue_name)

channel.basic_consume(queue=queue_name, on_message_callback=callback, auto_ack=True)
channel.start_consuming()
except pika.exceptions.AMQPError as e:
logger.error(f"RabbitMQ SSE listener connection lost: {e}. Reconnecting in 5 seconds...")
time.sleep(5)
except Exception as e:
logger.exception(f"Unexpected error in SSE listener: {e}. Reconnecting in 5 seconds...")
time.sleep(5)
Comment threadscansynclib/scansynclib/rabbitmq.py Outdated
Comment on lines +158 to +168
def declare_queue(self, queue_name: str, durable: bool = True):
if not queue_name or queue_name in self._declared_queues:
return
self._channel.queue_declare(queue=queue_name, durable=durable)
self._declared_queues.add(queue_name)

def declare_exchange(self, exchange: str, exchange_type: str = "fanout"):
if not exchange or exchange in self._declared_exchanges:
return
self._channel.exchange_declare(exchange=exchange, exchange_type=exchange_type)
self._declared_exchanges.add(exchange)
Comment on lines +92 to +94
client = RabbitMQClient(name="detection")
client.ensure_connection()
client.declare_queue(RABBITQUEUE)
Comment on lines 95 to +99
ch.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPConnectionError:
logger.error("Connection lost while acknowledging message. Reconnecting...")
connection, channel = connect_rabbitmq([RABBITQUEUE], heartbeat=120)
channel.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPError:
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")
Comment on lines +14 to +25
scansynclib/ProcessItem.py
scansynclib/__init__.py
scansynclib/config.py
scansynclib/helpers.py
scansynclib/logging.py
scansynclib/ollama_helper.py
scansynclib/onedrive_api.py
scansynclib/onedrive_smb_manager.py
scansynclib/openai_helper.py
scansynclib/settings.py
scansynclib/settings_schema.py
scansynclib/sqlite_wrapper.py
@maxi07

Copy link
Copy Markdown
Owner

remember to update rabbitmq as well.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 11 out of 11 changed files in this pull request and generated 3 comments.

Comment threadfile_naming_service/main.py Outdated
Comment on lines +99 to +103
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")
if not acknowledged:
return
Comment on lines +282 to +284
_publisher = RabbitMQClient(name="publisher")
_publisher_lock = threading.Lock()

Comment on lines +4 to +8
scansynclib/config.py
scansynclib/helpers.py
scansynclib/logging.py
scansynclib/ollama_helper.py
scansynclib/onedrive_api.py

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.

Comment on lines 94 to +99
try:
ch.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPConnectionError:
logger.error("Connection lost while acknowledging message. Reconnecting...")
connection, channel = connect_rabbitmq([RABBITQUEUE], heartbeat=120)
channel.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPError:
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in commit a3aebb8. The finally block now tracks ack_ok and only proceeds with DB updates and upload_queue forwarding when the ack succeeded. The test was also updated to verify that these follow-up actions are skipped on ack failure.

@maxi07
maxi07 marked this pull request as ready for review July 4, 2026 12:09
@maxi07

Copy link
Copy Markdown
Owner

@copilot resolve the merge conflicts in this pull request

Resolve conflicts:
- detection_service/main.py: keep RabbitMQClient setup, add cleanup_dangling_documents() from main
- upload_service/main.py: keep consume() from helpers, add execute_query import from main

CopilotAI commented Jul 4, 2026

Copy link
Copy Markdown
ContributorAuthor

@copilot resolve the merge conflicts in this pull request

Resolved in merge commit 2bb5f61. The two conflicts were:

@maxi07
maxi07 merged commit c9c60ed into mainJul 4, 2026
3 checks passed
@maxi07
maxi07 deleted the copilot/handle-rabbitmq-connection branch July 4, 2026 12:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

RabbitMQ is not used properly

3 participants

@maxi07
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Unify RabbitMQ handling with persistent, auto-reconnecting connections - #70

Merged
maxi07 merged 11 commits into
mainfrom
copilot/handle-rabbitmq-connection
Jul 4, 2026
Merged

Unify RabbitMQ handling with persistent, auto-reconnecting connections#70
maxi07 merged 11 commits into
mainfrom
copilot/handle-rabbitmq-connection

Conversation

CopilotAI commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

Services each built their own RabbitMQ connections and rebuilt them constantly, so the broker dropped clients with missed heartbeats from client, timeout: 60s. The goal: establish connections once, keep them alive, and centralize the logic.

Root cause

  • sqlite_wrapper opened the SSE publisher with the default 60s heartbeat and never serviced it during long OCR/upload/naming work → broker closed it every ~60s.
  • forward_to_rabbitmq opened and closed a new connection per message.
  • Every service duplicated its own connect/reconnect loop.

Changes

  • New scansynclib/rabbitmq.py — single source of truth for messaging:
    • RabbitMQClient: wraps one long-lived BlockingConnection, lazily connects, re-declares queues/exchanges after a reconnect, and transparently reconnects on publish/consume failures (default heartbeat 600s).
    • Helpers: publish, forward_to_rabbitmq (shared publisher connection), publish_to_exchange, consume (unified reconnecting consumer loop), process_events (heartbeat servicing for polling publishers), and a backward-compatible connect_rabbitmq.
  • helpers.py re-exports these so existing imports keep working.
  • sqlite_wrapper.py — SSE notify_sse_clients now publishes through the self-healing publisher (fixes the 60s drops).
  • Services refactored — OCR / file_naming / upload / metadata consume via consume(...); metadata publishes to ocr_queue via publish(...); detection uses RabbitMQClient + process_events; the web SSE listener reconnects instead of killing its thread. file_naming's fragile manual re-ack was dropped (broker redelivers after reconnect).
  • tests/test_rabbitmq.py — covers connection reuse, reconnect on StreamLostError, publish-failure handling, exchange declaration, pickling in forward_to_rabbitmq, and consumer reconnection.

Before → after

# Before: new connection opened and torn down for every messagedefforward_to_rabbitmq(queue_name, item):
connection, channel=connect_rabbitmq([queue_name])
channel.basic_publish(...)
connection.close()
# After: shared, long-lived connection that reconnects on demandforward_to_rabbitmq("upload_queue", item) # -> _publisher.publish(...)

Publishers and consumers use separate connections (recommended by RabbitMQ), and all reconnect automatically, eliminating the connection churn.

CopilotAI linked an issue Jul 2, 2026 that may be closed by this pull request
2 tasks
CopilotAI changed the title [WIP] Fix RabbitMQ connection handling by preserving the connectionUnify RabbitMQ handling with persistent, auto-reconnecting connectionsJul 2, 2026
CopilotAI requested a review from maxi07July 2, 2026 15:17
@maxi07
maxi07 requested a review from CopilotJuly 2, 2026 16:11

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR centralizes RabbitMQ connectivity into scansynclib to eliminate per-message connection churn and missed-heartbeat disconnects across ScanSync’s microservices, improving reliability for long-running OCR/upload/naming workloads and SSE updates.

Changes:

  • Introduces a unified RabbitMQClient + helper API in scansynclib.rabbitmq with long-lived, auto-reconnecting publish/consume patterns (and a backward-compatible connect_rabbitmq).
  • Refactors services to consume/publish via the shared helpers instead of duplicating connect/reconnect logic.
  • Adds focused unit tests for connection reuse and reconnect behavior.

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 5 comments.

Show a summary per file
FileDescription
web_service/src/main.pyKeeps SSE RabbitMQ listener thread alive via reconnect loop.
upload_service/main.pySwitches upload consumer to unified consume(...) helper.
ocr_service/main.pySwitches OCR consumer to unified consume(...) helper.
metadata_service/main.pyPublishes to OCR queue via unified publish(...) and consumes via consume(...).
file_naming_service/main.pySwitches consumer to unified consume(...) and changes ack/reconnect behavior.
detection_service/main.pyUses RabbitMQClient + process_events() to keep a single connection alive between scans.
scansynclib/scansynclib/rabbitmq.pyNew unified, reconnecting RabbitMQ connection/publish/consume implementation.
scansynclib/scansynclib/helpers.pyRe-exports RabbitMQ helpers for backward-compatible imports.
scansynclib/scansynclib/sqlite_wrapper.pyRoutes SSE publish through unified exchange publisher helper.
tests/test_rabbitmq.pyAdds tests covering connection reuse and reconnect logic.
scansynclib/scansynclib.egg-info/SOURCES.txtUpdates packaged file list (currently introduces duplicates).

Comment on lines +103 to +119
connection, channel = result

try:
# Use fanout as exchange type to broadcast messages to all connected clients
channel.exchange_declare(exchange=exchange_name, exchange_type='fanout')
queue_result = channel.queue_declare(queue='', exclusive=True)
queue_name = queue_result.method.queue
channel.queue_bind(exchange=exchange_name, queue=queue_name)

channel.basic_consume(queue=queue_name, on_message_callback=callback, auto_ack=True)
channel.start_consuming()
except pika.exceptions.AMQPError as e:
logger.error(f"RabbitMQ SSE listener connection lost: {e}. Reconnecting in 5 seconds...")
time.sleep(5)
except Exception as e:
logger.exception(f"Unexpected error in SSE listener: {e}. Reconnecting in 5 seconds...")
time.sleep(5)
Comment threadscansynclib/scansynclib/rabbitmq.py Outdated
Comment on lines +158 to +168
def declare_queue(self, queue_name: str, durable: bool = True):
if not queue_name or queue_name in self._declared_queues:
return
self._channel.queue_declare(queue=queue_name, durable=durable)
self._declared_queues.add(queue_name)

def declare_exchange(self, exchange: str, exchange_type: str = "fanout"):
if not exchange or exchange in self._declared_exchanges:
return
self._channel.exchange_declare(exchange=exchange, exchange_type=exchange_type)
self._declared_exchanges.add(exchange)
Comment on lines +92 to +94
client = RabbitMQClient(name="detection")
client.ensure_connection()
client.declare_queue(RABBITQUEUE)
Comment on lines 95 to +99
ch.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPConnectionError:
logger.error("Connection lost while acknowledging message. Reconnecting...")
connection, channel = connect_rabbitmq([RABBITQUEUE], heartbeat=120)
channel.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPError:
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")
Comment on lines +14 to +25
scansynclib/ProcessItem.py
scansynclib/__init__.py
scansynclib/config.py
scansynclib/helpers.py
scansynclib/logging.py
scansynclib/ollama_helper.py
scansynclib/onedrive_api.py
scansynclib/onedrive_smb_manager.py
scansynclib/openai_helper.py
scansynclib/settings.py
scansynclib/settings_schema.py
scansynclib/sqlite_wrapper.py
@maxi07

Copy link
Copy Markdown
Owner

remember to update rabbitmq as well.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 11 out of 11 changed files in this pull request and generated 3 comments.

Comment threadfile_naming_service/main.py Outdated
Comment on lines +99 to +103
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")
if not acknowledged:
return
Comment on lines +282 to +284
_publisher = RabbitMQClient(name="publisher")
_publisher_lock = threading.Lock()

Comment on lines +4 to +8
scansynclib/config.py
scansynclib/helpers.py
scansynclib/logging.py
scansynclib/ollama_helper.py
scansynclib/onedrive_api.py

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.

Comment on lines 94 to +99
try:
ch.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPConnectionError:
logger.error("Connection lost while acknowledging message. Reconnecting...")
connection, channel = connect_rabbitmq([RABBITQUEUE], heartbeat=120)
channel.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPError:
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in commit a3aebb8. The finally block now tracks ack_ok and only proceeds with DB updates and upload_queue forwarding when the ack succeeded. The test was also updated to verify that these follow-up actions are skipped on ack failure.

@maxi07
maxi07 marked this pull request as ready for review July 4, 2026 12:09
@maxi07

Copy link
Copy Markdown
Owner

@copilot resolve the merge conflicts in this pull request

Resolve conflicts:
- detection_service/main.py: keep RabbitMQClient setup, add cleanup_dangling_documents() from main
- upload_service/main.py: keep consume() from helpers, add execute_query import from main

CopilotAI commented Jul 4, 2026

Copy link
Copy Markdown
ContributorAuthor

@copilot resolve the merge conflicts in this pull request

Resolved in merge commit 2bb5f61. The two conflicts were:

@maxi07
maxi07 merged commit c9c60ed into mainJul 4, 2026
3 checks passed
@maxi07
maxi07 deleted the copilot/handle-rabbitmq-connection branch July 4, 2026 12:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

RabbitMQ is not used properly

3 participants

@maxi07
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Unify RabbitMQ handling with persistent, auto-reconnecting connections - #70

Merged
maxi07 merged 11 commits into
mainfrom
copilot/handle-rabbitmq-connection
Jul 4, 2026
Merged

Unify RabbitMQ handling with persistent, auto-reconnecting connections#70
maxi07 merged 11 commits into
mainfrom
copilot/handle-rabbitmq-connection

Conversation

CopilotAI commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

Services each built their own RabbitMQ connections and rebuilt them constantly, so the broker dropped clients with missed heartbeats from client, timeout: 60s. The goal: establish connections once, keep them alive, and centralize the logic.

Root cause

  • sqlite_wrapper opened the SSE publisher with the default 60s heartbeat and never serviced it during long OCR/upload/naming work → broker closed it every ~60s.
  • forward_to_rabbitmq opened and closed a new connection per message.
  • Every service duplicated its own connect/reconnect loop.

Changes

  • New scansynclib/rabbitmq.py — single source of truth for messaging:
    • RabbitMQClient: wraps one long-lived BlockingConnection, lazily connects, re-declares queues/exchanges after a reconnect, and transparently reconnects on publish/consume failures (default heartbeat 600s).
    • Helpers: publish, forward_to_rabbitmq (shared publisher connection), publish_to_exchange, consume (unified reconnecting consumer loop), process_events (heartbeat servicing for polling publishers), and a backward-compatible connect_rabbitmq.
  • helpers.py re-exports these so existing imports keep working.
  • sqlite_wrapper.py — SSE notify_sse_clients now publishes through the self-healing publisher (fixes the 60s drops).
  • Services refactored — OCR / file_naming / upload / metadata consume via consume(...); metadata publishes to ocr_queue via publish(...); detection uses RabbitMQClient + process_events; the web SSE listener reconnects instead of killing its thread. file_naming's fragile manual re-ack was dropped (broker redelivers after reconnect).
  • tests/test_rabbitmq.py — covers connection reuse, reconnect on StreamLostError, publish-failure handling, exchange declaration, pickling in forward_to_rabbitmq, and consumer reconnection.

Before → after

# Before: new connection opened and torn down for every messagedefforward_to_rabbitmq(queue_name, item):
connection, channel=connect_rabbitmq([queue_name])
channel.basic_publish(...)
connection.close()
# After: shared, long-lived connection that reconnects on demandforward_to_rabbitmq("upload_queue", item) # -> _publisher.publish(...)

Publishers and consumers use separate connections (recommended by RabbitMQ), and all reconnect automatically, eliminating the connection churn.

CopilotAI linked an issue Jul 2, 2026 that may be closed by this pull request
2 tasks
CopilotAI changed the title [WIP] Fix RabbitMQ connection handling by preserving the connectionUnify RabbitMQ handling with persistent, auto-reconnecting connectionsJul 2, 2026
CopilotAI requested a review from maxi07July 2, 2026 15:17
@maxi07
maxi07 requested a review from CopilotJuly 2, 2026 16:11

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR centralizes RabbitMQ connectivity into scansynclib to eliminate per-message connection churn and missed-heartbeat disconnects across ScanSync’s microservices, improving reliability for long-running OCR/upload/naming workloads and SSE updates.

Changes:

  • Introduces a unified RabbitMQClient + helper API in scansynclib.rabbitmq with long-lived, auto-reconnecting publish/consume patterns (and a backward-compatible connect_rabbitmq).
  • Refactors services to consume/publish via the shared helpers instead of duplicating connect/reconnect logic.
  • Adds focused unit tests for connection reuse and reconnect behavior.

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 5 comments.

Show a summary per file
FileDescription
web_service/src/main.pyKeeps SSE RabbitMQ listener thread alive via reconnect loop.
upload_service/main.pySwitches upload consumer to unified consume(...) helper.
ocr_service/main.pySwitches OCR consumer to unified consume(...) helper.
metadata_service/main.pyPublishes to OCR queue via unified publish(...) and consumes via consume(...).
file_naming_service/main.pySwitches consumer to unified consume(...) and changes ack/reconnect behavior.
detection_service/main.pyUses RabbitMQClient + process_events() to keep a single connection alive between scans.
scansynclib/scansynclib/rabbitmq.pyNew unified, reconnecting RabbitMQ connection/publish/consume implementation.
scansynclib/scansynclib/helpers.pyRe-exports RabbitMQ helpers for backward-compatible imports.
scansynclib/scansynclib/sqlite_wrapper.pyRoutes SSE publish through unified exchange publisher helper.
tests/test_rabbitmq.pyAdds tests covering connection reuse and reconnect logic.
scansynclib/scansynclib.egg-info/SOURCES.txtUpdates packaged file list (currently introduces duplicates).

Comment on lines +103 to +119
connection, channel = result

try:
# Use fanout as exchange type to broadcast messages to all connected clients
channel.exchange_declare(exchange=exchange_name, exchange_type='fanout')
queue_result = channel.queue_declare(queue='', exclusive=True)
queue_name = queue_result.method.queue
channel.queue_bind(exchange=exchange_name, queue=queue_name)

channel.basic_consume(queue=queue_name, on_message_callback=callback, auto_ack=True)
channel.start_consuming()
except pika.exceptions.AMQPError as e:
logger.error(f"RabbitMQ SSE listener connection lost: {e}. Reconnecting in 5 seconds...")
time.sleep(5)
except Exception as e:
logger.exception(f"Unexpected error in SSE listener: {e}. Reconnecting in 5 seconds...")
time.sleep(5)
Comment threadscansynclib/scansynclib/rabbitmq.py Outdated
Comment on lines +158 to +168
def declare_queue(self, queue_name: str, durable: bool = True):
if not queue_name or queue_name in self._declared_queues:
return
self._channel.queue_declare(queue=queue_name, durable=durable)
self._declared_queues.add(queue_name)

def declare_exchange(self, exchange: str, exchange_type: str = "fanout"):
if not exchange or exchange in self._declared_exchanges:
return
self._channel.exchange_declare(exchange=exchange, exchange_type=exchange_type)
self._declared_exchanges.add(exchange)
Comment on lines +92 to +94
client = RabbitMQClient(name="detection")
client.ensure_connection()
client.declare_queue(RABBITQUEUE)
Comment on lines 95 to +99
ch.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPConnectionError:
logger.error("Connection lost while acknowledging message. Reconnecting...")
connection, channel = connect_rabbitmq([RABBITQUEUE], heartbeat=120)
channel.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPError:
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")
Comment on lines +14 to +25
scansynclib/ProcessItem.py
scansynclib/__init__.py
scansynclib/config.py
scansynclib/helpers.py
scansynclib/logging.py
scansynclib/ollama_helper.py
scansynclib/onedrive_api.py
scansynclib/onedrive_smb_manager.py
scansynclib/openai_helper.py
scansynclib/settings.py
scansynclib/settings_schema.py
scansynclib/sqlite_wrapper.py
@maxi07

Copy link
Copy Markdown
Owner

remember to update rabbitmq as well.

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 11 out of 11 changed files in this pull request and generated 3 comments.

Comment threadfile_naming_service/main.py Outdated
Comment on lines +99 to +103
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")
if not acknowledged:
return
Comment on lines +282 to +284
_publisher = RabbitMQClient(name="publisher")
_publisher_lock = threading.Lock()

Comment on lines +4 to +8
scansynclib/config.py
scansynclib/helpers.py
scansynclib/logging.py
scansynclib/ollama_helper.py
scansynclib/onedrive_api.py

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.

Comment on lines 94 to +99
try:
ch.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPConnectionError:
logger.error("Connection lost while acknowledging message. Reconnecting...")
connection, channel = connect_rabbitmq([RABBITQUEUE], heartbeat=120)
channel.basic_ack(delivery_tag=method.delivery_tag)
except pika.exceptions.AMQPError:
# The connection was lost before we could acknowledge. The unified
# consumer will reconnect and the broker will redeliver the message.
logger.error("Connection lost while acknowledging message. It will be redelivered after reconnect.")

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in commit a3aebb8. The finally block now tracks ack_ok and only proceeds with DB updates and upload_queue forwarding when the ack succeeded. The test was also updated to verify that these follow-up actions are skipped on ack failure.

@maxi07
maxi07 marked this pull request as ready for review July 4, 2026 12:09
@maxi07

Copy link
Copy Markdown
Owner

@copilot resolve the merge conflicts in this pull request

Resolve conflicts:
- detection_service/main.py: keep RabbitMQClient setup, add cleanup_dangling_documents() from main
- upload_service/main.py: keep consume() from helpers, add execute_query import from main

CopilotAI commented Jul 4, 2026

Copy link
Copy Markdown
ContributorAuthor

@copilot resolve the merge conflicts in this pull request

Resolved in merge commit 2bb5f61. The two conflicts were:

@maxi07
maxi07 merged commit c9c60ed into mainJul 4, 2026
3 checks passed
@maxi07
maxi07 deleted the copilot/handle-rabbitmq-connection branch July 4, 2026 12:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

RabbitMQ is not used properly

3 participants

@maxi07