From 833df58b26e2dd4a397b3f1cec741897e0e4f581 Mon Sep 17 00:00:00 2001
From: Phil Del Vecchio <phil.delvecchio@datadoghq.com>
Date: Mon, 27 Apr 2026 12:43:30 -0400
Subject: [PATCH 1/2] Fix consecutive-acronym handling for tags like 'Bits AI
 SRE'

---
 .generator/conftest.py                        | 4 ++--
 .generator/src/generator/templates/apis.j2    | 2 +-
 .generator/src/generator/templates/example.j2 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.generator/conftest.py b/.generator/conftest.py
index 072bd784e6..0b670fa4ce 100644
--- a/.generator/conftest.py
+++ b/.generator/conftest.py
@@ -352,9 +352,9 @@ def undo_operations():
 @given(parsers.parse('an instance of "{name}" API'))
 def api(context, api_version, specs, name):
     """Return an API instance."""
-    assert name in {tag["name"].replace(" ", "") for tag in specs[api_version]["tags"]}
+    raw_tag = next(t["name"] for t in specs[api_version]["tags"] if t["name"].replace(" ", "") == name)
     sanitized_name = name.replace("-", "")
-    context["api_instance"] = {"name": sanitized_name}
+    context["api_instance"] = {"name": sanitized_name, "raw_tag": raw_tag}
 
 
 @given(parsers.parse('operation "{name}" enabled'))
diff --git a/.generator/src/generator/templates/apis.j2 b/.generator/src/generator/templates/apis.j2
index 608e9b0bbe..8a3e91a4de 100644
--- a/.generator/src/generator/templates/apis.j2
+++ b/.generator/src/generator/templates/apis.j2
@@ -1,6 +1,6 @@
 {%- for api in apis %}
 {%- set classname = api|class_name %}
-from {{ package }}.{{ version }}.api.{{ classname|safe_snake_case }} import {{ classname }}
+from {{ package }}.{{ version }}.api.{{ api|safe_snake_case }} import {{ classname }}
 {%- endfor %}
 
 
diff --git a/.generator/src/generator/templates/example.j2 b/.generator/src/generator/templates/example.j2
index 968446e7c3..137edcb6ab 100644
--- a/.generator/src/generator/templates/example.j2
+++ b/.generator/src/generator/templates/example.j2
@@ -14,7 +14,7 @@
 from {{ package }} import {{ values|sort|join(', ') }}
 {%- endfor %}
 from datadog_api_client import ApiClient, Configuration
-from datadog_api_client.{{ version }}.api.{{ context.api_instance.name|safe_snake_case }}_api import {{ context.api_instance.name }}Api
+from datadog_api_client.{{ version }}.api.{{ context.api_instance.raw_tag|safe_snake_case }}_api import {{ context.api_instance.name }}Api
 {%- for package in imports|sort %}
 from {{ package }} import {{ imports[package]|sort|join(', ') }}
 {%- endfor %}

From 75f811bf859231d4fa1087d7d3398b14d5daad41 Mon Sep 17 00:00:00 2001
From: Phil Del Vecchio <phil.delvecchio@datadoghq.com>
Date: Mon, 27 Apr 2026 13:35:34 -0400
Subject: [PATCH 2/2] Add missing _api suffix in apis.j2 import path

---
 .generator/src/generator/templates/apis.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.generator/src/generator/templates/apis.j2 b/.generator/src/generator/templates/apis.j2
index 8a3e91a4de..6944c5a89c 100644
--- a/.generator/src/generator/templates/apis.j2
+++ b/.generator/src/generator/templates/apis.j2
@@ -1,6 +1,6 @@
 {%- for api in apis %}
 {%- set classname = api|class_name %}
-from {{ package }}.{{ version }}.api.{{ api|safe_snake_case }} import {{ classname }}
+from {{ package }}.{{ version }}.api.{{ api|safe_snake_case }}_api import {{ classname }}
 {%- endfor %}