From 51000e39ff6461b0b324856cb1cac8f11dc5240d Mon Sep 17 00:00:00 2001
From: Cyber MacGeddon <cybermaggedon@gmail.com>
Date: Wed, 16 Apr 2025 20:50:41 +0100
Subject: [PATCH] More refactoring

---
 trustgraph-base/trustgraph/base/flow_processor.py   |  2 +-
 trustgraph-base/trustgraph/base/request_response.py |  4 ++--
 .../trustgraph/chunking/recursive/chunker.py        | 13 ++++---------
 .../trustgraph/chunking/token/chunker.py            | 11 +++--------
 .../trustgraph/decoding/pdf/pdf_decoder.py          |  2 +-
 5 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/trustgraph-base/trustgraph/base/flow_processor.py b/trustgraph-base/trustgraph/base/flow_processor.py
index 2ade11cc..96e6dbc9 100644
--- a/trustgraph-base/trustgraph/base/flow_processor.py
+++ b/trustgraph-base/trustgraph/base/flow_processor.py
@@ -105,7 +105,7 @@ class FlowProcessor(AsyncProcessor):
             consumer = self.subscribe(
                 flow = flow_obj,
                 queue = defn[name],
-                subscriber = self.subscriber,
+                subscriber = self.id,
                 schema = schema,
                 handler = handler,
                 metrics = consumer_metrics,
diff --git a/trustgraph-base/trustgraph/base/request_response.py b/trustgraph-base/trustgraph/base/request_response.py
index a97f0cd0..44259c2c 100644
--- a/trustgraph-base/trustgraph/base/request_response.py
+++ b/trustgraph-base/trustgraph/base/request_response.py
@@ -63,9 +63,9 @@ class RequestResponseService(FlowProcessor):
         print("Done.", flush=True)
 
     @staticmethod
-    def add_args(parser, default_subscriber):
+    def add_args(parser):
 
-        FlowProcessor.add_args(parser, default_subscriber)
+        FlowProcessor.add_args(parser)
 
 def run():
 
diff --git a/trustgraph-flow/trustgraph/chunking/recursive/chunker.py b/trustgraph-flow/trustgraph/chunking/recursive/chunker.py
index 752a7787..1106f02f 100755
--- a/trustgraph-flow/trustgraph/chunking/recursive/chunker.py
+++ b/trustgraph-flow/trustgraph/chunking/recursive/chunker.py
@@ -12,23 +12,18 @@ from ... schema import text_ingest_queue, chunk_ingest_queue
 from ... log_level import LogLevel
 from ... base import FlowProcessor
 
-module = "chunker"
-
-default_subscriber = module
+default_ident = "chunker"
 
 class Processor(FlowProcessor):
 
     def __init__(self, **params):
 
-        id = params.get("id")
-        subscriber = params.get("subscriber", default_subscriber)
+        id = params.get("id", default_ident)
         chunk_size = params.get("chunk_size", 2000)
         chunk_overlap = params.get("chunk_overlap", 100)
         
         super(Processor, self).__init__(
-            **params | {
-                "subscriber": subscriber,
-            }
+            **params | { "id": id }
         )
 
         if not hasattr(__class__, "chunk_metric"):
@@ -88,7 +83,7 @@ class Processor(FlowProcessor):
     @staticmethod
     def add_args(parser):
 
-        FlowProcessor.add_args(parser, default_subscriber)
+        FlowProcessor.add_args(parser)
 
         parser.add_argument(
             '-z', '--chunk-size',
diff --git a/trustgraph-flow/trustgraph/chunking/token/chunker.py b/trustgraph-flow/trustgraph/chunking/token/chunker.py
index 2ada07a0..be2799df 100755
--- a/trustgraph-flow/trustgraph/chunking/token/chunker.py
+++ b/trustgraph-flow/trustgraph/chunking/token/chunker.py
@@ -12,23 +12,18 @@ from ... schema import text_ingest_queue, chunk_ingest_queue
 from ... log_level import LogLevel
 from ... base import FlowProcessor
 
-module = "chunker"
-
-default_subscriber = module
+default_ident = "chunker"
 
 class Processor(FlowProcessor):
 
     def __init__(self, **params):
 
         id = params.get("id")
-        subscriber = params.get("subscriber", default_subscriber)
         chunk_size = params.get("chunk_size", 250)
         chunk_overlap = params.get("chunk_overlap", 15)
         
         super(Processor, self).__init__(
-            **params | {
-                "subscriber": subscriber,
-            }
+            **params | { "id": id }
         )
 
         if not hasattr(__class__, "chunk_metric"):
@@ -87,7 +82,7 @@ class Processor(FlowProcessor):
     @staticmethod
     def add_args(parser):
 
-        FlowProcessor.add_args(parser, default_subscriber)
+        FlowProcessor.add_args(parser)
 
         parser.add_argument(
             '-z', '--chunk-size',
diff --git a/trustgraph-flow/trustgraph/decoding/pdf/pdf_decoder.py b/trustgraph-flow/trustgraph/decoding/pdf/pdf_decoder.py
index 03e688c6..ae2e3d43 100755
--- a/trustgraph-flow/trustgraph/decoding/pdf/pdf_decoder.py
+++ b/trustgraph-flow/trustgraph/decoding/pdf/pdf_decoder.py
@@ -73,7 +73,7 @@ class Processor(FlowProcessor):
 
     @staticmethod
     def add_args(parser):
-        FlowProcessor.add_args(parser, default_ident)
+        FlowProcessor.add_args(parser)
 
 def run():