holmesgpt 0.16.1__tar.gz → 0.18.0__tar.gz

holmesgpt-0.18.0/LICENSE

@@ -0,0 +1,178 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2025 Robusta Dev LTD

{holmesgpt-0.16.1 → holmesgpt-0.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: holmesgpt
-Version: 0.16.1
+Version: 0.18.0
 Summary: 
 Author: Natan Yellin
 Author-email: natan@robusta.dev
@@ -58,7 +58,10 @@ Description-Content-Type: text/markdown
 
 HolmesGPT is an AI agent for investigating problems in your cloud, finding the root cause, and suggesting remediations. It has dozens of built-in integrations for cloud providers, observability tools, and on-call systems.
 
->🎉 **HolmesGPT is now a CNCF Sandbox Project!** We're thrilled to be part of the Cloud Native Computing Foundation. [Learn more about our journey](https://github.com/cncf/sandbox/issues/392#issuecomment-3380007501).
+[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/11586/badge)](https://www.bestpractices.dev/projects/11586)
+
+>🎉 **HolmesGPT is now a CNCF Sandbox Project!**  
+HolmesGPT was originally created by [Robusta.Dev](https://home.robusta.dev/) and is a CNCF sandbox project.
 
 Find more about HolmesGPT's maintainers and adopters [here](./ADOPTERS.md).
 
@@ -69,7 +72,7 @@ Find more about HolmesGPT's maintainers and adopters [here](./ADOPTERS.md).
     <a href="#installation"><strong>Installation</strong></a> |
     <a href="#supported-llm-providers"><strong>LLM Providers</strong></a> |
     <a href="https://www.youtube.com/watch?v=TfQfx65LsDQ"><strong>YouTube Demo</strong></a> |
-    <a href="https://deepwiki.com/robusta-dev/holmesgpt"><img src="https://deepwiki.com/badge.svg" alt="Ask DeepWiki"></a>
+    <a href="https://deepwiki.com/HolmesGPT/holmesgpt"><img src="https://deepwiki.com/badge.svg" alt="Ask DeepWiki"></a>
   </p>
 </div>
 
@@ -247,7 +250,7 @@ Because HolmesGPT relies on LLMs, it relies on [a suite of pytest based evaluati
 
 
 ## License
-Distributed under the MIT License. See [LICENSE.txt](https://github.com/robusta-dev/holmesgpt/blob/master/LICENSE.txt) for more information.
+Distributed under the Apache 2.0 License. See [LICENSE](https://github.com/HolmesGPT/holmesgpt/blob/master/LICENSE) for more information.
 <!-- Change License -->
 
 ## Community
@@ -260,13 +263,14 @@ Join our community to discuss the HolmesGPT roadmap and share feedback:
 
 ## Support
 
-If you have any questions, feel free to message us on [robustacommunity.slack.com](https://bit.ly/robusta-slack)
+If you have any questions, feel free to message us on [HolmesGPT Slack Channel](https://cloud-native.slack.com/archives/C0A1SPQM5PZ)
 
 ## How to Contribute
 
 Please read our [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines and instructions.
 
-For help, contact us on [Slack](https://bit.ly/robusta-slack) or ask [DeepWiki AI](https://deepwiki.com/robusta-dev/holmesgpt) your questions.
+For help, contact us on [Slack](https://cloud-native.slack.com/archives/C0A1SPQM5PZ) or ask [DeepWiki AI](https://deepwiki.com/HolmesGPT/holmesgpt) your questions.
 
-[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/robusta-dev/holmesgpt)
+Please make sure to follow the CNCF code of conduct - [details here](https://github.com/HolmesGPT/holmesgpt/blob/master/CODE_OF_CONDUCT.md).
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/HolmesGPT/holmesgpt)
 

{holmesgpt-0.16.1 → holmesgpt-0.18.0}/README.md

@@ -3,7 +3,10 @@
 
 HolmesGPT is an AI agent for investigating problems in your cloud, finding the root cause, and suggesting remediations. It has dozens of built-in integrations for cloud providers, observability tools, and on-call systems.
 
->🎉 **HolmesGPT is now a CNCF Sandbox Project!** We're thrilled to be part of the Cloud Native Computing Foundation. [Learn more about our journey](https://github.com/cncf/sandbox/issues/392#issuecomment-3380007501).
+[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/11586/badge)](https://www.bestpractices.dev/projects/11586)
+
+>🎉 **HolmesGPT is now a CNCF Sandbox Project!**  
+HolmesGPT was originally created by [Robusta.Dev](https://home.robusta.dev/) and is a CNCF sandbox project.
 
 Find more about HolmesGPT's maintainers and adopters [here](./ADOPTERS.md).
 
@@ -14,7 +17,7 @@ Find more about HolmesGPT's maintainers and adopters [here](./ADOPTERS.md).
     <a href="#installation"><strong>Installation</strong></a> |
     <a href="#supported-llm-providers"><strong>LLM Providers</strong></a> |
     <a href="https://www.youtube.com/watch?v=TfQfx65LsDQ"><strong>YouTube Demo</strong></a> |
-    <a href="https://deepwiki.com/robusta-dev/holmesgpt"><img src="https://deepwiki.com/badge.svg" alt="Ask DeepWiki"></a>
+    <a href="https://deepwiki.com/HolmesGPT/holmesgpt"><img src="https://deepwiki.com/badge.svg" alt="Ask DeepWiki"></a>
   </p>
 </div>
 
@@ -192,7 +195,7 @@ Because HolmesGPT relies on LLMs, it relies on [a suite of pytest based evaluati
 
 
 ## License
-Distributed under the MIT License. See [LICENSE.txt](https://github.com/robusta-dev/holmesgpt/blob/master/LICENSE.txt) for more information.
+Distributed under the Apache 2.0 License. See [LICENSE](https://github.com/HolmesGPT/holmesgpt/blob/master/LICENSE) for more information.
 <!-- Change License -->
 
 ## Community
@@ -205,12 +208,13 @@ Join our community to discuss the HolmesGPT roadmap and share feedback:
 
 ## Support
 
-If you have any questions, feel free to message us on [robustacommunity.slack.com](https://bit.ly/robusta-slack)
+If you have any questions, feel free to message us on [HolmesGPT Slack Channel](https://cloud-native.slack.com/archives/C0A1SPQM5PZ)
 
 ## How to Contribute
 
 Please read our [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines and instructions.
 
-For help, contact us on [Slack](https://bit.ly/robusta-slack) or ask [DeepWiki AI](https://deepwiki.com/robusta-dev/holmesgpt) your questions.
+For help, contact us on [Slack](https://cloud-native.slack.com/archives/C0A1SPQM5PZ) or ask [DeepWiki AI](https://deepwiki.com/HolmesGPT/holmesgpt) your questions.
 
-[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/robusta-dev/holmesgpt)
+Please make sure to follow the CNCF code of conduct - [details here](https://github.com/HolmesGPT/holmesgpt/blob/master/CODE_OF_CONDUCT.md).
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/HolmesGPT/holmesgpt)

{holmesgpt-0.16.1 → holmesgpt-0.18.0}/holmes/__init__.py

@@ -1,5 +1,5 @@
 # This is patched by github actions during release
-__version__ = "0.16.1"
+__version__ = "0.18.0"
 
 # Re-export version functions from version module for backward compatibility
 from .version import (

{holmesgpt-0.16.1 → holmesgpt-0.18.0}/holmes/clients/robusta_client.py

@@ -25,7 +25,6 @@ class RobustaModelsResponse(BaseModel):
     models: Dict[str, RobustaModel]
 
 
-@cache
 def fetch_robusta_models(
     account_id: str, token: str
 ) -> Optional[RobustaModelsResponse]:

{holmesgpt-0.16.1 → holmesgpt-0.18.0}/holmes/common/env_vars.py

@@ -94,7 +94,9 @@ TOOL_MAX_ALLOCATED_CONTEXT_WINDOW_PCT = float(
 )
 
 # Absolute max tokens to allocate for a single tool response
-TOOL_MAX_ALLOCATED_CONTEXT_WINDOW_TOKENS = 25000
+TOOL_MAX_ALLOCATED_CONTEXT_WINDOW_TOKENS = int(
+    os.environ.get("TOOL_MAX_ALLOCATED_CONTEXT_WINDOW_TOKENS", 25000)
+)
 
 MAX_EVIDENCE_DATA_CHARACTERS_BEFORE_TRUNCATION = int(
     os.environ.get("MAX_EVIDENCE_DATA_CHARACTERS_BEFORE_TRUNCATION", 3000)
@@ -109,3 +111,12 @@ DISABLE_PROMETHEUS_TOOLSET = load_bool("DISABLE_PROMETHEUS_TOOLSET", False)
 RESET_REPEATED_TOOL_CALL_CHECK_AFTER_COMPACTION = load_bool(
     "RESET_REPEATED_TOOL_CALL_CHECK_AFTER_COMPACTION", True
 )
+
+SSE_READ_TIMEOUT = float(os.environ.get("SSE_READ_TIMEOUT", "120"))
+
+LLM_REQUEST_TIMEOUT = float(os.environ.get("LLM_REQUEST_TIMEOUT", "600"))
+
+ENABLE_CONNECTION_KEEPALIVE = load_bool("ENABLE_CONNECTION_KEEPALIVE", False)
+KEEPALIVE_IDLE = int(os.environ.get("KEEPALIVE_IDLE", 2))
+KEEPALIVE_INTVL = int(os.environ.get("KEEPALIVE_INTVL", 2))
+KEEPALIVE_CNT = int(os.environ.get("KEEPALIVE_CNT", 5))

{holmesgpt-0.16.1 → holmesgpt-0.18.0}/holmes/config.py

@@ -84,6 +84,7 @@ class Config(RobustaBaseConfig):
     opsgenie_query: Optional[str] = None
 
     custom_runbooks: List[FilePath] = []
+    custom_runbook_catalogs: List[Union[str, FilePath]] = []
 
     # custom_toolsets is passed from config file, and be used to override built-in toolsets, provides 'stable' customized toolset.
     # The status of custom toolsets can be cached.
@@ -114,6 +115,7 @@ class Config(RobustaBaseConfig):
                 custom_toolsets=self.custom_toolsets,
                 custom_toolsets_from_cli=self.custom_toolsets_from_cli,
                 global_fast_model=self.fast_model,
+                custom_runbook_catalogs=self.custom_runbook_catalogs,
             )
         return self._toolset_manager
 
@@ -224,8 +226,9 @@ class Config(RobustaBaseConfig):
         return None
 
     def get_runbook_catalog(self) -> Optional[RunbookCatalog]:
-        # TODO(mainred): besides the built-in runbooks, we need to allow the user to bring their own runbooks
-        runbook_catalog = load_runbook_catalog(dal=self.dal)
+        runbook_catalog = load_runbook_catalog(
+            dal=self.dal, custom_catalog_paths=self.custom_runbook_catalogs
+        )
         return runbook_catalog
 
     def create_console_tool_executor(
@@ -285,12 +288,15 @@ class Config(RobustaBaseConfig):
         dal: Optional["SupabaseDal"] = None,
         refresh_toolsets: bool = False,
         tracer=None,
+        model_name: Optional[str] = None,
     ) -> "ToolCallingLLM":
         tool_executor = self.create_console_tool_executor(dal, refresh_toolsets)
         from holmes.core.tool_calling_llm import ToolCallingLLM
 
         return ToolCallingLLM(
-            tool_executor, self.max_steps, self._get_llm(tracer=tracer)
+            tool_executor,
+            self.max_steps,
+            self._get_llm(tracer=tracer, model_key=model_name),
         )
 
     def create_agui_toolcalling_llm(
@@ -344,7 +350,7 @@ class Config(RobustaBaseConfig):
         )
 
     def create_console_issue_investigator(
-        self, dal: Optional["SupabaseDal"] = None
+        self, dal: Optional["SupabaseDal"] = None, model_name: Optional[str] = None
     ) -> "IssueInvestigator":
         all_runbooks = load_builtin_runbooks()
         for runbook_path in self.custom_runbooks:
@@ -360,7 +366,7 @@ class Config(RobustaBaseConfig):
             tool_executor=tool_executor,
             runbook_manager=runbook_manager,
             max_steps=self.max_steps,
-            llm=self._get_llm(),
+            llm=self._get_llm(model_key=model_name),
             cluster_name=self.cluster_name,
         )
 
@@ -478,7 +484,6 @@ class Config(RobustaBaseConfig):
         model_params = model_entry.model_dump(exclude_none=True)
         api_base = self.api_base
         api_version = self.api_version
-
         is_robusta_model = model_params.pop("is_robusta_model", False)
         sentry_sdk.set_tag("is_robusta_model", is_robusta_model)
         if is_robusta_model:

{holmesgpt-0.16.1 → holmesgpt-0.18.0}/holmes/core/conversations.py

@@ -12,8 +12,9 @@ from holmes.core.tool_calling_llm import ToolCallingLLM
 from holmes.plugins.runbooks import RunbookCatalog
 from holmes.utils.global_instructions import (
     Instructions,
-    add_runbooks_to_user_prompt,
+    generate_runbooks_args,
 )
+from holmes.core.prompt import generate_user_prompt
 
 DEFAULT_TOOL_SIZE = 10000
 
@@ -121,11 +122,14 @@ def build_issue_chat_messages(
     tools_for_investigation = issue_chat_request.investigation_result.tools
 
     if not conversation_history or len(conversation_history) == 0:
-        user_prompt = add_runbooks_to_user_prompt(
-            user_prompt=user_prompt,
+        runbooks_ctx = generate_runbooks_args(
             runbook_catalog=runbooks,
             global_instructions=global_instructions,
         )
+        user_prompt = generate_user_prompt(
+            user_prompt,
+            runbooks_ctx,
+        )
 
         number_of_tools_for_investigation = len(tools_for_investigation)  # type: ignore
         if number_of_tools_for_investigation == 0:
@@ -208,11 +212,14 @@ def build_issue_chat_messages(
             },
         ]
 
-    user_prompt = add_runbooks_to_user_prompt(
-        user_prompt=user_prompt,
+    runbooks_ctx = generate_runbooks_args(
         runbook_catalog=runbooks,
         global_instructions=global_instructions,
     )
+    user_prompt = generate_user_prompt(
+        user_prompt,
+        runbooks_ctx,
+    )
 
     conversation_history.append(
         {
@@ -385,11 +392,14 @@ def build_chat_messages(
         runbooks=runbooks,
     )
 
-    ask = add_runbooks_to_user_prompt(
-        user_prompt=ask,
+    runbooks_ctx = generate_runbooks_args(
         runbook_catalog=runbooks,
         global_instructions=global_instructions,
     )
+    ask = generate_user_prompt(
+        ask,
+        runbooks_ctx,
+    )
 
     conversation_history.append(  # type: ignore
         {
@@ -481,11 +491,14 @@ def build_workload_health_chat_messages(
     resource = workload_health_chat_request.resource
 
     if not conversation_history or len(conversation_history) == 0:
-        user_prompt = add_runbooks_to_user_prompt(
-            user_prompt=user_prompt,
+        runbooks_ctx = generate_runbooks_args(
             runbook_catalog=runbooks,
             global_instructions=global_instructions,
         )
+        user_prompt = generate_user_prompt(
+            user_prompt,
+            runbooks_ctx,
+        )
 
         number_of_tools_for_workload = len(tools_for_workload)  # type: ignore
         if number_of_tools_for_workload == 0:
@@ -568,11 +581,14 @@ def build_workload_health_chat_messages(
             },
         ]
 
-    user_prompt = add_runbooks_to_user_prompt(
-        user_prompt=user_prompt,
+    runbooks_ctx = generate_runbooks_args(
         runbook_catalog=runbooks,
         global_instructions=global_instructions,
     )
+    user_prompt = generate_user_prompt(
+        user_prompt,
+        runbooks_ctx,
+    )
 
     conversation_history.append(
         {

{holmesgpt-0.16.1 → holmesgpt-0.18.0}/holmes/core/investigation.py

@@ -10,7 +10,8 @@ from holmes.core.models import InvestigateRequest, InvestigationResult
 from holmes.core.supabase_dal import SupabaseDal
 from holmes.core.tracing import DummySpan, SpanType
 from holmes.plugins.runbooks import RunbookCatalog
-from holmes.utils.global_instructions import add_runbooks_to_user_prompt
+from holmes.utils.global_instructions import generate_runbooks_args
+from holmes.core.prompt import generate_user_prompt
 
 from holmes.core.investigation_structured_output import (
     DEFAULT_SECTIONS,
@@ -19,6 +20,7 @@ from holmes.core.investigation_structured_output import (
 )
 
 from holmes.plugins.prompts import load_and_render_prompt
+from holmes.utils import sentry_helper
 
 
 def investigate_issues(
@@ -31,9 +33,6 @@ def investigate_issues(
 ) -> InvestigationResult:
     context = dal.get_issue_data(investigate_request.context.get("robusta_issue_id"))
 
-    resource_instructions = dal.get_resource_instructions(
-        "alert", investigate_request.context.get("issue_type")
-    )
     global_instructions = dal.get_global_instructions_for_account()
 
     raw_data = investigate_request.model_dump()
@@ -59,7 +58,6 @@ def investigate_issues(
         issue,
         prompt=investigate_request.prompt_template,
         post_processing_prompt=HOLMES_POST_PROCESSING_PROMPT,
-        instructions=resource_instructions,
         global_instructions=global_instructions,
         sections=investigate_request.sections,
         trace_span=trace_span,
@@ -68,6 +66,9 @@ def investigate_issues(
 
     (text_response, sections) = process_response_into_sections(investigation.result)
 
+    if sections is None:
+        sentry_helper.capture_sections_none(content=investigation.result)
+
     logging.debug(f"text response: {text_response}")
     return InvestigationResult(
         analysis=text_response,
@@ -101,10 +102,6 @@ def get_investigation_context(
 
     issue_instructions = ai.runbook_manager.get_instructions_for_issue(issue)
 
-    resource_instructions = dal.get_resource_instructions(
-        "alert", investigate_request.context.get("issue_type")
-    )
-
     # This section is about setting vars to request the LLM to return structured output.
     # It does not mean that Holmes will not return structured sections for investigation as it is
     # capable of splitting the markdown into sections
@@ -140,17 +137,20 @@ def get_investigation_context(
             "runbooks_enabled": True if runbook_catalog else False,
         },
     )
-    user_prompt = ""
+    base_user = ""
 
     global_instructions = dal.get_global_instructions_for_account()
-    user_prompt = add_runbooks_to_user_prompt(
-        user_prompt=user_prompt,
+    runbooks_ctx = generate_runbooks_args(
         runbook_catalog=runbook_catalog,
         global_instructions=global_instructions,
         issue_instructions=issue_instructions,
-        resource_instructions=resource_instructions,
     )
 
-    user_prompt = f"{user_prompt}\n #This is context from the issue:\n{issue.raw}"
+    base_user = f"{base_user}\n #This is context from the issue:\n{issue.raw}"
+
+    user_prompt = generate_user_prompt(
+        base_user,
+        runbooks_ctx,
+    )
 
     return ai, system_prompt, user_prompt, response_format, sections, issue_instructions