Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/bin/service_mailbox.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
PostgresServiceFactory.set_instance(factory)

mailbox_config = get_services_config().get("redmine_mailbox", {})
redmine = redmine.Redmine('Redmine_Helpdesk_Mail') # this name tells redmine class to not initialize archi() class
redmine_instance = redmine.Redmine('Redmine_Helpdesk_Mail') # this name tells redmine class to not initialize archi() class

while True:
mail = mailbox.Mailbox(user = user, password = password)
mail.process_messages(redmine)
mail.process_messages(redmine_instance)
time.sleep(int(mailbox_config["mailbox_update_time"]))
8 changes: 4 additions & 4 deletions src/bin/service_redmine.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
PostgresServiceFactory.set_instance(factory)

redmine_config = get_services_config().get("redmine_mailbox", {})
redmine = redmine.Redmine('Redmine_Helpdesk')
redmine_instance = redmine.Redmine('Redmine_Helpdesk')

while True:
redmine.load()
redmine.process_new_issues()
redmine.process_resolved_issues()
redmine_instance.load()
redmine_instance.process_new_issues()
redmine_instance.process_resolved_issues()
time.sleep(int(redmine_config["redmine_update_time"]))
14 changes: 11 additions & 3 deletions src/interfaces/redmine_mailer_integration/redmine.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,14 @@ def __init__(self):
self.redmine_config = self.services_config.get("redmine_mailbox", {})
self.data_path = self.global_config["DATA_PATH"]

chat_app_config = self.services_config.get("chat_app", {})

# agent
agent_class = self.redmine_config.get("agent_class") or self.redmine_config.get("pipeline", "CMSCompOpsAgent")
agent_class = (self.redmine_config.get("agent_class")
or self.redmine_config.get("pipeline")
or chat_app_config.get("agent_class")
or chat_app_config.get("pipeline", "CMSCompOpsAgent"))
Comment on lines +50 to +51
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

we should not be reading from the chat app configs here


agents_dir = Path(
self.redmine_config.get("agents_dir")
or self.services_config.get("chat_app", {}).get("agents_dir", "/root/archi/agents")
Expand All @@ -52,8 +58,10 @@ def __init__(self):
agent_spec = select_agent_spec(agents_dir)
except AgentSpecError as exc:
raise ValueError(f"Failed to load agent spec: {exc}") from exc
default_provider = self.redmine_config.get("default_provider")
default_model = self.redmine_config.get("default_model")
default_provider = (self.redmine_config.get("default_provider")
or chat_app_config.get("default_provider"))
default_model = (self.redmine_config.get("default_model")
or chat_app_config.get("default_model"))
Comment on lines +62 to +64
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

we should not be reading from the chat app configs

self.archi = archi(
pipeline=agent_class,
agent_spec=agent_spec,
Expand Down
Loading