Resolve merge conflicts

This commit is contained in:
Tyler O 2025-02-12 09:54:37 +00:00 committed by Cyber MacGeddon
parent 1b4d6feb04
commit 69ec869515
2 changed files with 3 additions and 3 deletions

View file

@ -42,13 +42,13 @@ class BaseClient:
auth = pulsar.AuthenticationToken(pulsar_api_key)
self.client = pulsar.Client(
pulsar_host,
logger=pulsar.ConsoleLogger(log_level),
authentication=auth,
logger=pulsar.ConsoleLogger(log_level.to_pulsar())
)
else:
self.client = pulsar.Client(
pulsar_host,
logger=pulsar.ConsoleLogger(log_level.to_pulsar())
logger=pulsar.ConsoleLogger(log_level)
)
self.producer = self.client.create_producer(

View file

@ -47,7 +47,7 @@ class Processor(ConsumerProducer):
self.embeddings = EmbeddingsClient(
pulsar_host=self.pulsar_host,
pulsar_api_key=self.pulsar_api_key,
pulsar_api_key=self.pulsar_api_key,
input_queue=emb_request_queue,
output_queue=emb_response_queue,
subscriber=module + "-emb",