chore(ads): restructure package

AndreyMarkinPPC · AndreyMarkinPPC · commit fc51192f20c3 · 2026-01-10T00:29:27.000+04:00
diff --git a/libs/community/google/ads/README.md b/libs/community/google/ads/README.md
@@ -19,8 +19,8 @@
 ```
 import os
 
-from garf_io import writer
-from garf_google_ads import GoogleAdsApiReportFetcher
+from garf.io import writer
+from garf.community.google.ads import GoogleAdsApiReportFetcher
 
 query = """
 SELECT
@@ -54,9 +54,9 @@ garf <PATH_TO_QUERIES> --source google-ads \
 
 where:
 
-* `<PATH_TO_QUERIES>` - local or remove files containing queries
-* `<OUTPUT_TYPE>` - output supported by [`garf-io` library](../garf_io/README.md).
-* `<SOURCE_PARAMETER=VALUE` - key-value pairs to refine fetching, check [available source parameters](#available-source-parameters).
+* `PATH_TO_QUERIES` - local or remove files containing queries
+* `output` - output supported by [`garf-io` library](https://google.github.io/garf/usage/writers/).
+* `SOURCE_PARAMETER=VALUE` - key-value pairs to refine fetching, check [available source parameters](#available-source-parameters).
 
 ###  Available source parameters
 
diff --git a/libs/community/google/ads/garf/community/google/ads/__init__.py b/libs/community/google/ads/garf/community/google/ads/__init__.py
@@ -0,0 +1,25 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Library for getting reports from Google Ads API."""
+
+from garf.community.google.ads.api_clients import GoogleAdsApiClient
+from garf.community.google.ads.report_fetcher import GoogleAdsApiReportFetcher
+
+__all__ = [
+  'GoogleAdsApiClient',
+  'GoogleAdsApiReportFetcher',
+]
+
+__version__ = '0.0.5'
diff --git a/libs/community/google/ads/garf/community/google/ads/api_clients.py b/libs/community/google/ads/garf/community/google/ads/api_clients.py
@@ -29,14 +29,13 @@
 import smart_open
 import tenacity
 import yaml
-from garf_core import api_clients
+from garf.community.google.ads import exceptions, query_editor
+from garf.core import api_clients
 from google import protobuf
 from google.ads.googleads import client as googleads_client
 from google.api_core import exceptions as google_exceptions
 from typing_extensions import override
 
-from garf_google_ads import exceptions, query_editor
-
 GOOGLE_ADS_API_VERSION: Final = googleads_client._DEFAULT_VERSION
 google_ads_service = importlib.import_module(
   f'google.ads.googleads.{GOOGLE_ADS_API_VERSION}.'
diff --git a/libs/community/google/ads/garf/community/google/ads/builtins/__init__.py b/libs/community/google/ads/garf/community/google/ads/builtins/__init__.py
@@ -0,0 +1,18 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from garf.community.google.ads.builtins import ocid_mapping
+
+BUILTIN_QUERIES = {
+  'ocid_mapping': ocid_mapping.get_ocid_mapping,
+}
diff --git a/libs/community/google/ads/garf/community/google/ads/builtins/ocid_mapping.py b/libs/community/google/ads/garf/community/google/ads/builtins/ocid_mapping.py
diff --git a/libs/community/google/ads/garf/community/google/ads/exceptions.py b/libs/community/google/ads/garf/community/google/ads/exceptions.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from garf_core import exceptions
+from garf.core import exceptions
 
 
 class GoogleAdsApiError(exceptions.GarfError):
diff --git a/libs/community/google/ads/garf/community/google/ads/parsers.py b/libs/community/google/ads/garf/community/google/ads/parsers.py
@@ -23,13 +23,12 @@
 from typing import Union, get_args
 
 import proto  # type: ignore
-from garf_core import parsers
+from garf.community.google.ads import api_clients, query_editor
+from garf.core import parsers
 from google import protobuf
 from proto.marshal.collections import repeated
 from typing_extensions import Self, TypeAlias
 
-from garf_google_ads import api_clients, query_editor
-
 google_ads_service = importlib.import_module(
   f'google.ads.googleads.{api_clients.GOOGLE_ADS_API_VERSION}.'
   'services.types.google_ads_service'
diff --git a/libs/community/google/ads/garf/community/google/ads/query_editor.py b/libs/community/google/ads/garf/community/google/ads/query_editor.py
@@ -15,7 +15,7 @@
 
 import re
 
-from garf_core import query_editor
+from garf.core import query_editor
 
 
 class GoogleAdsApiQuery(query_editor.QuerySpecification):
diff --git a/libs/community/google/ads/garf/community/google/ads/report_fetcher.py b/libs/community/google/ads/garf/community/google/ads/report_fetcher.py
@@ -19,9 +19,8 @@
 import operator
 import warnings
 
-import garf_core
-
-from garf_google_ads import (
+import garf.core
+from garf.community.google.ads import (
   GoogleAdsApiClient,
   builtins,
   exceptions,
@@ -34,13 +33,13 @@ class GoogleAdsApiReportFetcherError(exceptions.GoogleAdsApiError):
   """Report fetcher specific error."""
 
 
-class GoogleAdsApiReportFetcher(garf_core.ApiReportFetcher):
+class GoogleAdsApiReportFetcher(garf.core.ApiReportFetcher):
   """Defines report fetcher."""
 
   def __init__(
     self,
     api_client: GoogleAdsApiClient | None = None,
-    parser: garf_core.parsers.ProtoParser = parsers.GoogleAdsRowParser,
+    parser: garf.core.parsers.ProtoParser = parsers.GoogleAdsRowParser,
     query_spec: query_editor.GoogleAdsApiQuery = (
       query_editor.GoogleAdsApiQuery
     ),
@@ -64,12 +63,12 @@ def __init__(
   def fetch(
     self,
     query_specification: str | query_editor.GoogleAdsApiQuery,
-    args: garf_core.query_editor.GarfQueryParameters | None = None,
+    args: garf.core.query_editor.GarfQueryParameters | None = None,
     account: str | list[str] | None = None,
     expand_mcc: bool = False,
     customer_ids_query: str | None = None,
     **kwargs: str,
-  ) -> garf_core.GarfReport:
+  ) -> garf.core.GarfReport:
     """Fetches data from Google Ads API.
 
     Args:
@@ -196,7 +195,7 @@ def _get_customer_ids(
         account=[str(a) for a in child_customer_ids],
       )
       child_customer_ids = [
-        row[0] if isinstance(row, garf_core.report.GarfRow) else row
+        row[0] if isinstance(row, garf.core.report.GarfRow) else row
         for row in child_customer_ids
       ]
 
diff --git a/libs/community/google/ads/garf/community/google/ads/simulator.py b/libs/community/google/ads/garf/community/google/ads/simulator.py
@@ -19,11 +19,10 @@
 import logging
 from typing import Any
 
-import garf_core
-from garf_core import simulator
-
-from garf_google_ads import parsers, query_editor
-from garf_google_ads.api_clients import GoogleAdsApiClient
+import garf.core
+from garf.community.google.ads import parsers, query_editor
+from garf.community.google.ads.api_clients import GoogleAdsApiClient
+from garf.core import simulator
 
 logger = logging.getLogger(__name__)
 
@@ -36,7 +35,7 @@ class GoogleAdsApiReportSimulator(simulator.ApiReportSimulator):
   def __init__(
     self,
     api_client: GoogleAdsApiClient | None = None,
-    parser: garf_core.parsers.ProtoParser = parsers.GoogleAdsRowParser,
+    parser: garf.core.parsers.ProtoParser = parsers.GoogleAdsRowParser,
     query_spec: query_editor.GoogleAdsApiQuery = (
       query_editor.GoogleAdsApiQuery
     ),
diff --git a/libs/community/google/ads/garf_google_ads/__init__.py b/libs/community/google/ads/garf_google_ads/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,14 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Library for getting reports from Google Ads API."""
+import warnings
 
-from garf_google_ads.api_clients import GoogleAdsApiClient
-from garf_google_ads.report_fetcher import GoogleAdsApiReportFetcher
+from garf.community.google.ads import *
 
-__all__ = [
-  'GoogleAdsApiClient',
-  'GoogleAdsApiReportFetcher',
-]
-
-__version__ = '0.0.5'
+warnings.warn(
+  "The 'garf_google_ads' namespace is deprecated. "
+  "Please use 'garf.community.google.ads' instead.",
+  DeprecationWarning,
+  stacklevel=2,
+)
diff --git a/libs/community/google/ads/garf_google_ads/builtins/__init__.py b/libs/community/google/ads/garf_google_ads/builtins/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,8 +11,14 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from garf_google_ads.builtins import ocid_mapping
 
-BUILTIN_QUERIES = {
-  'ocid_mapping': ocid_mapping.get_ocid_mapping,
-}
+import warnings
+
+from garf.community.google.ads.builtins import *
+
+warnings.warn(
+  "The 'garf_google_ads.builtins' namespace is deprecated. "
+  "Please use 'garf.community.google.ads.builtins' instead.",
+  DeprecationWarning,
+  stacklevel=2,
+)
diff --git a/libs/community/google/ads/pyproject.toml b/libs/community/google/ads/pyproject.toml
@@ -26,10 +26,10 @@ classifiers = [
 dynamic=["version"]
 
 [tool.setuptools.dynamic]
-version = {attr = "garf_google_ads.__version__"}
+version = {attr = "garf.community.google.ads.__version__"}
 
 [project.entry-points.garf]
-google-ads = "garf_google_ads.report_fetcher"
+google-ads = "garf.community.google.ads.report_fetcher"
 
 [options.extras_require]
 test =  [
@@ -38,6 +38,6 @@ test =  [
   "python-dotenv",
 ]
 
-[[tool.uv.index]]
-url = "https://pypi.org/simple"
-default = true
+[tool.setuptools.packages.find]
+where = ["."]
+include=["garf_google_ads", "garf"]
diff --git a/libs/community/google/ads/tests/unit/test_query_editor.py b/libs/community/google/ads/tests/unit/test_query_editor.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-from garf_google_ads.query_editor import GoogleAdsApiQuery
+from garf.community.google.ads.query_editor import GoogleAdsApiQuery
 
 
 class TestGoogleAdsApiQuery:
@@ -33,10 +33,7 @@ def test_generate(self):
       'ad_group_ad.policy_summary.policy_topic_entries',
       'ad_group_ad_asset_view.policy_summary',
     ]
-    assert (
-      spec.customizers.get('policy_topic_type').value
-      == 'type_'
-    )
+    assert spec.customizers.get('policy_topic_type').value == 'type_'
     assert (
       spec.customizers.get('asset_policy_type').value
       == 'policy_topic_entries.type_'
diff --git a/libs/community/google/ads/tests/unit/test_simulator.py b/libs/community/google/ads/tests/unit/test_simulator.py
@@ -14,7 +14,7 @@
 import os
 
 import pytest
-from garf_google_ads import simulator
+from garf.community.google.ads import simulator
 
 
 @pytest.mark.skipif(
