feat: add support for reading apiVersion in discovery artifacts

Author: parthea

googleapiclient/discovery.py

@@ -1170,9 +1170,11 @@ def method(self, **kwargs):
         elif "response" not in methodDesc:
             model = RawModel()
 
+        api_version = methodDesc.get("apiVersion", None)
+
         headers = {}
         headers, params, query, body = model.request(
-            headers, actual_path_params, actual_query_params, body_value
+            headers, actual_path_params, actual_query_params, body_value, api_version
         )
 
         expanded_url = uritemplate.expand(pathUrl, params)

googleapiclient/model.py

@@ -30,6 +30,7 @@
 
 from googleapiclient import version as googleapiclient_version
 from googleapiclient.errors import HttpError
+from google.api_core.gapic_v1.version_header import API_VERSION_METADATA_KEY
 
 _LIBRARY_VERSION = googleapiclient_version.__version__
 _PY_VERSION = platform.python_version()
@@ -121,15 +122,18 @@ def _log_request(self, headers, path_params, query, body):
             LOGGER.info("query: %s", query)
             LOGGER.info("--request-end--")
 
-    def request(self, headers, path_params, query_params, body_value):
+    def request(self, headers, path_params, query_params, body_value, api_version=None):
         """Updates outgoing requests with a serialized body.
 
         Args:
           headers: dict, request headers
           path_params: dict, parameters that appear in the request path
           query_params: dict, parameters that appear in the query
           body_value: object, the request body as a Python object, which must be
-                      serializable by json.
+              serializable by json.
+          api_version: str, The precise API version represented by this request,
+              which will result in an API Version header being sent along with the
+              HTTP request.
         Returns:
           A tuple of (headers, path_params, query, body)
 
@@ -154,6 +158,8 @@ def request(self, headers, path_params, query_params, body_value):
             _LIBRARY_VERSION,
             _PY_VERSION,
         )
+        if api_version:
+            headers[API_VERSION_METADATA_KEY] = api_version
 
         if body_value is not None:
             headers["content-type"] = self.content_type

setup.py

@@ -42,7 +42,8 @@
     # NOTE: Maintainers, please do not require google-api-core>=2.x.x
     # Until this issue is closed
     # https://github.com/googleapis/google-cloud-python/issues/10566
-    "google-api-core >= 1.31.5, <3.0.0.dev0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0",
+    "google-api-core[grpc] @ git+https://github.com/googleapis/python-api-core.git@add-api-version-header",
+    #"google-api-core >= 1.31.5, <3.0.0.dev0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0",
     "uritemplate>=3.0.1,<5",
 ]
 

testing/constraints-3.10.txt

@@ -2,5 +2,4 @@
 httplib2==0.19.0
 google-auth==1.32.0
 google-auth-httplib2==0.2.0
-google-api-core
 uritemplate==3.0.1

testing/constraints-3.7.txt

@@ -9,5 +9,4 @@
 httplib2==0.19.0
 google-auth==1.32.0
 google-auth-httplib2==0.2.0
-google-api-core==1.31.5
 uritemplate==3.0.1

testing/constraints-3.8.txt

@@ -2,5 +2,4 @@
 httplib2==0.19.0
 google-auth
 google-auth-httplib2==0.2.0
-google-api-core==1.31.5
 uritemplate==3.0.1

testing/constraints-3.9.txt

@@ -3,5 +3,4 @@
 httplib2==0.19.0
 google-auth
 google-auth-httplib2==0.2.0
-google-api-core==2.15.0
 uritemplate==3.0.1

tests/test_json_model.py

@@ -34,6 +34,7 @@
 from googleapiclient.errors import HttpError
 import googleapiclient.model
 from googleapiclient.model import JsonModel
+from google.api_core.gapic_v1.version_header import API_VERSION_METADATA_KEY
 
 _LIBRARY_VERSION = googleapiclient_version.__version__
 CSV_TEXT_MOCK = "column1,column2,column3\nstring1,1.2,string2"
@@ -171,6 +172,25 @@ def test_x_goog_api_client(self):
             + " gl-python/"
             + platform.python_version(),
         )
+    
+    def test_x_goog_api_version(self):
+        model = JsonModel(data_wrapper=False)
+
+        # test header composition for cloud clients that wrap discovery
+        headers = {}
+        path_params = {}
+        query_params = {}
+        body = {}
+        api_version = "20240401"
+
+        headers, _, _, body = model.request(
+            headers, path_params, query_params, body, api_version
+        )
+
+        self.assertEqual(
+            headers[API_VERSION_METADATA_KEY],
+            api_version,
+        )
 
     def test_bad_response(self):
         model = JsonModel(data_wrapper=False)