From c2a4b82e2115b615fa5cfb4d62a4d86dbbacf0fb Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 15:48:29 +0000 Subject: [PATCH 01/11] chore: remove 'pip install' statements from python_library templates [autoapprove] (#170) Source-Link: https://github.com/googleapis/synthtool/commit/1f37ce74cbc4897f35c9ba5c40393b102da913b1 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:8e84e0e0d71a0d681668461bba02c9e1394c785f31a10ae3470660235b673086 --- .github/.OwlBot.lock.yaml | 4 +- .kokoro/publish-docs.sh | 4 +- .kokoro/release.sh | 5 +- .kokoro/requirements.in | 8 + .kokoro/requirements.txt | 464 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 476 insertions(+), 9 deletions(-) create mode 100644 .kokoro/requirements.in create mode 100644 .kokoro/requirements.txt diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index c701359..1c14d7f 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:c6c965a4bf40c19011b11f87dbc801a66d3a23fbc6704102be064ef31c51f1c3 -# created: 2022-08-09T15:58:56.463048506Z + digest: sha256:8e84e0e0d71a0d681668461bba02c9e1394c785f31a10ae3470660235b673086 +# created: 2022-08-24T15:24:05.205983455Z diff --git a/.kokoro/publish-docs.sh b/.kokoro/publish-docs.sh index 8acb14e..1c4d623 100755 --- a/.kokoro/publish-docs.sh +++ b/.kokoro/publish-docs.sh @@ -21,14 +21,12 @@ export PYTHONUNBUFFERED=1 export PATH="${HOME}/.local/bin:${PATH}" # Install nox -python3 -m pip install --user --upgrade --quiet nox +python3 -m pip install --require-hashes -r .kokoro/requirements.txt python3 -m nox --version # build docs nox -s docs -python3 -m pip install --user gcp-docuploader - # create metadata python3 -m docuploader create-metadata \ --name=$(jq --raw-output '.name // empty' .repo-metadata.json) \ diff --git a/.kokoro/release.sh b/.kokoro/release.sh index cffb219..bf1e7c6 100755 --- a/.kokoro/release.sh +++ b/.kokoro/release.sh @@ -16,12 +16,9 @@ set -eo pipefail # Start the releasetool reporter -python3 -m pip install gcp-releasetool +python3 -m pip install --require-hashes -r .kokoro/requirements.txt python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script -# Ensure that we have the latest versions of Twine, Wheel, and Setuptools. -python3 -m pip install --upgrade twine wheel setuptools - # Disable buffering, so that the logs stream through. export PYTHONUNBUFFERED=1 diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in new file mode 100644 index 0000000..7718391 --- /dev/null +++ b/.kokoro/requirements.in @@ -0,0 +1,8 @@ +gcp-docuploader +gcp-releasetool +importlib-metadata +typing-extensions +twine +wheel +setuptools +nox \ No newline at end of file diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt new file mode 100644 index 0000000..c4b824f --- /dev/null +++ b/.kokoro/requirements.txt @@ -0,0 +1,464 @@ +# +# This file is autogenerated by pip-compile with python 3.10 +# To update, run: +# +# pip-compile --allow-unsafe --generate-hashes requirements.in +# +argcomplete==2.0.0 \ + --hash=sha256:6372ad78c89d662035101418ae253668445b391755cfe94ea52f1b9d22425b20 \ + --hash=sha256:cffa11ea77999bb0dd27bb25ff6dc142a6796142f68d45b1a26b11f58724561e + # via nox +attrs==22.1.0 \ + --hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 \ + --hash=sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c + # via gcp-releasetool +bleach==5.0.1 \ + --hash=sha256:085f7f33c15bd408dd9b17a4ad77c577db66d76203e5984b1bd59baeee948b2a \ + --hash=sha256:0d03255c47eb9bd2f26aa9bb7f2107732e7e8fe195ca2f64709fcf3b0a4a085c + # via readme-renderer +cachetools==5.2.0 \ + --hash=sha256:6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757 \ + --hash=sha256:f9f17d2aec496a9aa6b76f53e3b614c965223c061982d434d160f930c698a9db + # via google-auth +certifi==2022.6.15 \ + --hash=sha256:84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d \ + --hash=sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412 + # via requests +cffi==1.15.1 \ + --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \ + --hash=sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef \ + --hash=sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104 \ + --hash=sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426 \ + --hash=sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405 \ + --hash=sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375 \ + --hash=sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a \ + --hash=sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e \ + --hash=sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc \ + --hash=sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf \ + --hash=sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185 \ + --hash=sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497 \ + --hash=sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3 \ + --hash=sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35 \ + --hash=sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c \ + --hash=sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83 \ + --hash=sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21 \ + --hash=sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca \ + --hash=sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984 \ + --hash=sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac \ + --hash=sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd \ + --hash=sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee \ + --hash=sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a \ + --hash=sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2 \ + --hash=sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192 \ + --hash=sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7 \ + --hash=sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585 \ + --hash=sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f \ + --hash=sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e \ + --hash=sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27 \ + --hash=sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b \ + --hash=sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e \ + --hash=sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e \ + --hash=sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d \ + --hash=sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c \ + --hash=sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415 \ + --hash=sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82 \ + --hash=sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02 \ + --hash=sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314 \ + --hash=sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325 \ + --hash=sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c \ + --hash=sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3 \ + --hash=sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914 \ + --hash=sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045 \ + --hash=sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d \ + --hash=sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9 \ + --hash=sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5 \ + --hash=sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2 \ + --hash=sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c \ + --hash=sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3 \ + --hash=sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2 \ + --hash=sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8 \ + --hash=sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d \ + --hash=sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d \ + --hash=sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9 \ + --hash=sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162 \ + --hash=sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76 \ + --hash=sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4 \ + --hash=sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e \ + --hash=sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9 \ + --hash=sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6 \ + --hash=sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b \ + --hash=sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01 \ + --hash=sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0 + # via cryptography +charset-normalizer==2.1.1 \ + --hash=sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845 \ + --hash=sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f + # via requests +click==8.0.4 \ + --hash=sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1 \ + --hash=sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb + # via + # gcp-docuploader + # gcp-releasetool +colorlog==6.6.0 \ + --hash=sha256:344f73204009e4c83c5b6beb00b3c45dc70fcdae3c80db919e0a4171d006fde8 \ + --hash=sha256:351c51e866c86c3217f08e4b067a7974a678be78f07f85fc2d55b8babde6d94e + # via + # gcp-docuploader + # nox +commonmark==0.9.1 \ + --hash=sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60 \ + --hash=sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9 + # via rich +cryptography==37.0.4 \ + --hash=sha256:190f82f3e87033821828f60787cfa42bff98404483577b591429ed99bed39d59 \ + --hash=sha256:2be53f9f5505673eeda5f2736bea736c40f051a739bfae2f92d18aed1eb54596 \ + --hash=sha256:30788e070800fec9bbcf9faa71ea6d8068f5136f60029759fd8c3efec3c9dcb3 \ + --hash=sha256:3d41b965b3380f10e4611dbae366f6dc3cefc7c9ac4e8842a806b9672ae9add5 \ + --hash=sha256:4c590ec31550a724ef893c50f9a97a0c14e9c851c85621c5650d699a7b88f7ab \ + --hash=sha256:549153378611c0cca1042f20fd9c5030d37a72f634c9326e225c9f666d472884 \ + --hash=sha256:63f9c17c0e2474ccbebc9302ce2f07b55b3b3fcb211ded18a42d5764f5c10a82 \ + --hash=sha256:6bc95ed67b6741b2607298f9ea4932ff157e570ef456ef7ff0ef4884a134cc4b \ + --hash=sha256:7099a8d55cd49b737ffc99c17de504f2257e3787e02abe6d1a6d136574873441 \ + --hash=sha256:75976c217f10d48a8b5a8de3d70c454c249e4b91851f6838a4e48b8f41eb71aa \ + --hash=sha256:7bc997818309f56c0038a33b8da5c0bfbb3f1f067f315f9abd6fc07ad359398d \ + --hash=sha256:80f49023dd13ba35f7c34072fa17f604d2f19bf0989f292cedf7ab5770b87a0b \ + --hash=sha256:91ce48d35f4e3d3f1d83e29ef4a9267246e6a3be51864a5b7d2247d5086fa99a \ + --hash=sha256:a958c52505c8adf0d3822703078580d2c0456dd1d27fabfb6f76fe63d2971cd6 \ + --hash=sha256:b62439d7cd1222f3da897e9a9fe53bbf5c104fff4d60893ad1355d4c14a24157 \ + --hash=sha256:b7f8dd0d4c1f21759695c05a5ec8536c12f31611541f8904083f3dc582604280 \ + --hash=sha256:d204833f3c8a33bbe11eda63a54b1aad7aa7456ed769a982f21ec599ba5fa282 \ + --hash=sha256:e007f052ed10cc316df59bc90fbb7ff7950d7e2919c9757fd42a2b8ecf8a5f67 \ + --hash=sha256:f2dcb0b3b63afb6df7fd94ec6fbddac81b5492513f7b0436210d390c14d46ee8 \ + --hash=sha256:f721d1885ecae9078c3f6bbe8a88bc0786b6e749bf32ccec1ef2b18929a05046 \ + --hash=sha256:f7a6de3e98771e183645181b3627e2563dcde3ce94a9e42a3f427d2255190327 \ + --hash=sha256:f8c0a6e9e1dd3eb0414ba320f85da6b0dcbd543126e30fcc546e7372a7fbf3b9 + # via + # gcp-releasetool + # secretstorage +distlib==0.3.5 \ + --hash=sha256:a7f75737c70be3b25e2bee06288cec4e4c221de18455b2dd037fe2a795cab2fe \ + --hash=sha256:b710088c59f06338ca514800ad795a132da19fda270e3ce4affc74abf955a26c + # via virtualenv +docutils==0.19 \ + --hash=sha256:33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6 \ + --hash=sha256:5e1de4d849fee02c63b040a4a3fd567f4ab104defd8a5511fbbc24a8a017efbc + # via readme-renderer +filelock==3.8.0 \ + --hash=sha256:55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc \ + --hash=sha256:617eb4e5eedc82fc5f47b6d61e4d11cb837c56cb4544e39081099fa17ad109d4 + # via virtualenv +gcp-docuploader==0.6.3 \ + --hash=sha256:ba8c9d76b3bbac54b0311c503a373b00edc2dc02d6d54ea9507045adb8e870f7 \ + --hash=sha256:c0f5aaa82ce1854a386197e4e359b120ad6d4e57ae2c812fce42219a3288026b + # via -r requirements.in +gcp-releasetool==1.8.6 \ + --hash=sha256:42e51ab8e2e789bc8e22a03c09352962cd3452951c801a2230d564816630304a \ + --hash=sha256:a3518b79d1b243c494eac392a01c7fd65187fd6d52602dcab9b529bc934d4da1 + # via -r requirements.in +google-api-core==2.8.2 \ + --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \ + --hash=sha256:93c6a91ccac79079ac6bbf8b74ee75db970cc899278b97d53bc012f35908cf50 + # via + # google-cloud-core + # google-cloud-storage +google-auth==2.11.0 \ + --hash=sha256:be62acaae38d0049c21ca90f27a23847245c9f161ff54ede13af2cb6afecbac9 \ + --hash=sha256:ed65ecf9f681832298e29328e1ef0a3676e3732b2e56f41532d45f70a22de0fb + # via + # gcp-releasetool + # google-api-core + # google-cloud-core + # google-cloud-storage +google-cloud-core==2.3.2 \ + --hash=sha256:8417acf6466be2fa85123441696c4badda48db314c607cf1e5d543fa8bdc22fe \ + --hash=sha256:b9529ee7047fd8d4bf4a2182de619154240df17fbe60ead399078c1ae152af9a + # via google-cloud-storage +google-cloud-storage==2.5.0 \ + --hash=sha256:19a26c66c317ce542cea0830b7e787e8dac2588b6bfa4d3fd3b871ba16305ab0 \ + --hash=sha256:382f34b91de2212e3c2e7b40ec079d27ee2e3dbbae99b75b1bcd8c63063ce235 + # via gcp-docuploader +google-crc32c==1.3.0 \ + --hash=sha256:04e7c220798a72fd0f08242bc8d7a05986b2a08a0573396187fd32c1dcdd58b3 \ + --hash=sha256:05340b60bf05b574159e9bd940152a47d38af3fb43803ffe71f11d704b7696a6 \ + --hash=sha256:12674a4c3b56b706153a358eaa1018c4137a5a04635b92b4652440d3d7386206 \ + --hash=sha256:127f9cc3ac41b6a859bd9dc4321097b1a4f6aa7fdf71b4f9227b9e3ebffb4422 \ + --hash=sha256:13af315c3a0eec8bb8b8d80b8b128cb3fcd17d7e4edafc39647846345a3f003a \ + --hash=sha256:1926fd8de0acb9d15ee757175ce7242e235482a783cd4ec711cc999fc103c24e \ + --hash=sha256:226f2f9b8e128a6ca6a9af9b9e8384f7b53a801907425c9a292553a3a7218ce0 \ + --hash=sha256:276de6273eb074a35bc598f8efbc00c7869c5cf2e29c90748fccc8c898c244df \ + --hash=sha256:318f73f5484b5671f0c7f5f63741ab020a599504ed81d209b5c7129ee4667407 \ + --hash=sha256:3bbce1be3687bbfebe29abdb7631b83e6b25da3f4e1856a1611eb21854b689ea \ + --hash=sha256:42ae4781333e331a1743445931b08ebdad73e188fd554259e772556fc4937c48 \ + --hash=sha256:58be56ae0529c664cc04a9c76e68bb92b091e0194d6e3c50bea7e0f266f73713 \ + --hash=sha256:5da2c81575cc3ccf05d9830f9e8d3c70954819ca9a63828210498c0774fda1a3 \ + --hash=sha256:6311853aa2bba4064d0c28ca54e7b50c4d48e3de04f6770f6c60ebda1e975267 \ + --hash=sha256:650e2917660e696041ab3dcd7abac160b4121cd9a484c08406f24c5964099829 \ + --hash=sha256:6a4db36f9721fdf391646685ecffa404eb986cbe007a3289499020daf72e88a2 \ + --hash=sha256:779cbf1ce375b96111db98fca913c1f5ec11b1d870e529b1dc7354b2681a8c3a \ + --hash=sha256:7f6fe42536d9dcd3e2ffb9d3053f5d05221ae3bbcefbe472bdf2c71c793e3183 \ + --hash=sha256:891f712ce54e0d631370e1f4997b3f182f3368179198efc30d477c75d1f44942 \ + --hash=sha256:95c68a4b9b7828ba0428f8f7e3109c5d476ca44996ed9a5f8aac6269296e2d59 \ + --hash=sha256:96a8918a78d5d64e07c8ea4ed2bc44354e3f93f46a4866a40e8db934e4c0d74b \ + --hash=sha256:9c3cf890c3c0ecfe1510a452a165431b5831e24160c5fcf2071f0f85ca5a47cd \ + --hash=sha256:9f58099ad7affc0754ae42e6d87443299f15d739b0ce03c76f515153a5cda06c \ + --hash=sha256:a0b9e622c3b2b8d0ce32f77eba617ab0d6768b82836391e4f8f9e2074582bf02 \ + --hash=sha256:a7f9cbea4245ee36190f85fe1814e2d7b1e5f2186381b082f5d59f99b7f11328 \ + --hash=sha256:bab4aebd525218bab4ee615786c4581952eadc16b1ff031813a2fd51f0cc7b08 \ + --hash=sha256:c124b8c8779bf2d35d9b721e52d4adb41c9bfbde45e6a3f25f0820caa9aba73f \ + --hash=sha256:c9da0a39b53d2fab3e5467329ed50e951eb91386e9d0d5b12daf593973c3b168 \ + --hash=sha256:ca60076c388728d3b6ac3846842474f4250c91efbfe5afa872d3ffd69dd4b318 \ + --hash=sha256:cb6994fff247987c66a8a4e550ef374671c2b82e3c0d2115e689d21e511a652d \ + --hash=sha256:d1c1d6236feab51200272d79b3d3e0f12cf2cbb12b208c835b175a21efdb0a73 \ + --hash=sha256:dd7760a88a8d3d705ff562aa93f8445ead54f58fd482e4f9e2bafb7e177375d4 \ + --hash=sha256:dda4d8a3bb0b50f540f6ff4b6033f3a74e8bf0bd5320b70fab2c03e512a62812 \ + --hash=sha256:e0f1ff55dde0ebcfbef027edc21f71c205845585fffe30d4ec4979416613e9b3 \ + --hash=sha256:e7a539b9be7b9c00f11ef16b55486141bc2cdb0c54762f84e3c6fc091917436d \ + --hash=sha256:eb0b14523758e37802f27b7f8cd973f5f3d33be7613952c0df904b68c4842f0e \ + --hash=sha256:ed447680ff21c14aaceb6a9f99a5f639f583ccfe4ce1a5e1d48eb41c3d6b3217 \ + --hash=sha256:f52a4ad2568314ee713715b1e2d79ab55fab11e8b304fd1462ff5cccf4264b3e \ + --hash=sha256:fbd60c6aaa07c31d7754edbc2334aef50601b7f1ada67a96eb1eb57c7c72378f \ + --hash=sha256:fc28e0db232c62ca0c3600884933178f0825c99be4474cdd645e378a10588125 \ + --hash=sha256:fe31de3002e7b08eb20823b3735b97c86c5926dd0581c7710a680b418a8709d4 \ + --hash=sha256:fec221a051150eeddfdfcff162e6db92c65ecf46cb0f7bb1bf812a1520ec026b \ + --hash=sha256:ff71073ebf0e42258a42a0b34f2c09ec384977e7f6808999102eedd5b49920e3 + # via google-resumable-media +google-resumable-media==2.3.3 \ + --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \ + --hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5 + # via google-cloud-storage +googleapis-common-protos==1.56.4 \ + --hash=sha256:8eb2cbc91b69feaf23e32452a7ae60e791e09967d81d4fcc7fc388182d1bd394 \ + --hash=sha256:c25873c47279387cfdcbdafa36149887901d36202cb645a0e4f29686bf6e4417 + # via google-api-core +idna==3.3 \ + --hash=sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff \ + --hash=sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d + # via requests +importlib-metadata==4.12.0 \ + --hash=sha256:637245b8bab2b6502fcbc752cc4b7a6f6243bb02b31c5c26156ad103d3d45670 \ + --hash=sha256:7401a975809ea1fdc658c3aa4f78cc2195a0e019c5cbc4c06122884e9ae80c23 + # via + # -r requirements.in + # twine +jeepney==0.8.0 \ + --hash=sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806 \ + --hash=sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755 + # via + # keyring + # secretstorage +jinja2==3.1.2 \ + --hash=sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852 \ + --hash=sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61 + # via gcp-releasetool +keyring==23.8.2 \ + --hash=sha256:0d9973f8891850f1ade5f26aafd06bb16865fbbae3fc56b0defb6a14a2624003 \ + --hash=sha256:10d2a8639663fe2090705a00b8c47c687cacdf97598ea9c11456679fa974473a + # via + # gcp-releasetool + # twine +markupsafe==2.1.1 \ + --hash=sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003 \ + --hash=sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88 \ + --hash=sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5 \ + --hash=sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7 \ + --hash=sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a \ + --hash=sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603 \ + --hash=sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1 \ + --hash=sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135 \ + --hash=sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247 \ + --hash=sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6 \ + --hash=sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601 \ + --hash=sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77 \ + --hash=sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02 \ + --hash=sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e \ + --hash=sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63 \ + --hash=sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f \ + --hash=sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980 \ + --hash=sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b \ + --hash=sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812 \ + --hash=sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff \ + --hash=sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96 \ + --hash=sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1 \ + --hash=sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925 \ + --hash=sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a \ + --hash=sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6 \ + --hash=sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e \ + --hash=sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f \ + --hash=sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4 \ + --hash=sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f \ + --hash=sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3 \ + --hash=sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c \ + --hash=sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a \ + --hash=sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417 \ + --hash=sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a \ + --hash=sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a \ + --hash=sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37 \ + --hash=sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452 \ + --hash=sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933 \ + --hash=sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a \ + --hash=sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7 + # via jinja2 +nox==2022.8.7 \ + --hash=sha256:1b894940551dc5c389f9271d197ca5d655d40bdc6ccf93ed6880e4042760a34b \ + --hash=sha256:96cca88779e08282a699d672258ec01eb7c792d35bbbf538c723172bce23212c + # via -r requirements.in +packaging==21.3 \ + --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \ + --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 + # via + # gcp-releasetool + # nox +pkginfo==1.8.3 \ + --hash=sha256:848865108ec99d4901b2f7e84058b6e7660aae8ae10164e015a6dcf5b242a594 \ + --hash=sha256:a84da4318dd86f870a9447a8c98340aa06216bfc6f2b7bdc4b8766984ae1867c + # via twine +platformdirs==2.5.2 \ + --hash=sha256:027d8e83a2d7de06bbac4e5ef7e023c02b863d7ea5d079477e722bb41ab25788 \ + --hash=sha256:58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19 + # via virtualenv +protobuf==3.20.1 \ + --hash=sha256:06059eb6953ff01e56a25cd02cca1a9649a75a7e65397b5b9b4e929ed71d10cf \ + --hash=sha256:097c5d8a9808302fb0da7e20edf0b8d4703274d140fd25c5edabddcde43e081f \ + --hash=sha256:284f86a6207c897542d7e956eb243a36bb8f9564c1742b253462386e96c6b78f \ + --hash=sha256:32ca378605b41fd180dfe4e14d3226386d8d1b002ab31c969c366549e66a2bb7 \ + --hash=sha256:3cc797c9d15d7689ed507b165cd05913acb992d78b379f6014e013f9ecb20996 \ + --hash=sha256:62f1b5c4cd6c5402b4e2d63804ba49a327e0c386c99b1675c8a0fefda23b2067 \ + --hash=sha256:69ccfdf3657ba59569c64295b7d51325f91af586f8d5793b734260dfe2e94e2c \ + --hash=sha256:6f50601512a3d23625d8a85b1638d914a0970f17920ff39cec63aaef80a93fb7 \ + --hash=sha256:7403941f6d0992d40161aa8bb23e12575637008a5a02283a930addc0508982f9 \ + --hash=sha256:755f3aee41354ae395e104d62119cb223339a8f3276a0cd009ffabfcdd46bb0c \ + --hash=sha256:77053d28427a29987ca9caf7b72ccafee011257561259faba8dd308fda9a8739 \ + --hash=sha256:7e371f10abe57cee5021797126c93479f59fccc9693dafd6bd5633ab67808a91 \ + --hash=sha256:9016d01c91e8e625141d24ec1b20fed584703e527d28512aa8c8707f105a683c \ + --hash=sha256:9be73ad47579abc26c12024239d3540e6b765182a91dbc88e23658ab71767153 \ + --hash=sha256:adc31566d027f45efe3f44eeb5b1f329da43891634d61c75a5944e9be6dd42c9 \ + --hash=sha256:adfc6cf69c7f8c50fd24c793964eef18f0ac321315439d94945820612849c388 \ + --hash=sha256:af0ebadc74e281a517141daad9d0f2c5d93ab78e9d455113719a45a49da9db4e \ + --hash=sha256:cb29edb9eab15742d791e1025dd7b6a8f6fcb53802ad2f6e3adcb102051063ab \ + --hash=sha256:cd68be2559e2a3b84f517fb029ee611546f7812b1fdd0aa2ecc9bc6ec0e4fdde \ + --hash=sha256:cdee09140e1cd184ba9324ec1df410e7147242b94b5f8b0c64fc89e38a8ba531 \ + --hash=sha256:db977c4ca738dd9ce508557d4fce0f5aebd105e158c725beec86feb1f6bc20d8 \ + --hash=sha256:dd5789b2948ca702c17027c84c2accb552fc30f4622a98ab5c51fcfe8c50d3e7 \ + --hash=sha256:e250a42f15bf9d5b09fe1b293bdba2801cd520a9f5ea2d7fb7536d4441811d20 \ + --hash=sha256:ff8d8fa42675249bb456f5db06c00de6c2f4c27a065955917b28c4f15978b9c3 + # via + # gcp-docuploader + # gcp-releasetool + # google-api-core +py==1.11.0 \ + --hash=sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719 \ + --hash=sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378 + # via nox +pyasn1==0.4.8 \ + --hash=sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d \ + --hash=sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba + # via + # pyasn1-modules + # rsa +pyasn1-modules==0.2.8 \ + --hash=sha256:905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e \ + --hash=sha256:a50b808ffeb97cb3601dd25981f6b016cbb3d31fbf57a8b8a87428e6158d0c74 + # via google-auth +pycparser==2.21 \ + --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \ + --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 + # via cffi +pygments==2.13.0 \ + --hash=sha256:56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1 \ + --hash=sha256:f643f331ab57ba3c9d89212ee4a2dabc6e94f117cf4eefde99a0574720d14c42 + # via + # readme-renderer + # rich +pyjwt==2.4.0 \ + --hash=sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf \ + --hash=sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba + # via gcp-releasetool +pyparsing==3.0.9 \ + --hash=sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb \ + --hash=sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc + # via packaging +pyperclip==1.8.2 \ + --hash=sha256:105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57 + # via gcp-releasetool +python-dateutil==2.8.2 \ + --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \ + --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9 + # via gcp-releasetool +readme-renderer==37.0 \ + --hash=sha256:07b7ea234e03e58f77cc222e206e6abb8f4c0435becce5104794ee591f9301c5 \ + --hash=sha256:9fa416704703e509eeb900696751c908ddeb2011319d93700d8f18baff887a69 + # via twine +requests==2.28.1 \ + --hash=sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983 \ + --hash=sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349 + # via + # gcp-releasetool + # google-api-core + # google-cloud-storage + # requests-toolbelt + # twine +requests-toolbelt==0.9.1 \ + --hash=sha256:380606e1d10dc85c3bd47bf5a6095f815ec007be7a8b69c878507068df059e6f \ + --hash=sha256:968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0 + # via twine +rfc3986==2.0.0 \ + --hash=sha256:50b1502b60e289cb37883f3dfd34532b8873c7de9f49bb546641ce9cbd256ebd \ + --hash=sha256:97aacf9dbd4bfd829baad6e6309fa6573aaf1be3f6fa735c8ab05e46cecb261c + # via twine +rich==12.5.1 \ + --hash=sha256:2eb4e6894cde1e017976d2975ac210ef515d7548bc595ba20e195fb9628acdeb \ + --hash=sha256:63a5c5ce3673d3d5fbbf23cd87e11ab84b6b451436f1b7f19ec54b6bc36ed7ca + # via twine +rsa==4.9 \ + --hash=sha256:90260d9058e514786967344d0ef75fa8727eed8a7d2e43ce9f4bcf1b536174f7 \ + --hash=sha256:e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21 + # via google-auth +secretstorage==3.3.3 \ + --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \ + --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 + # via keyring +six==1.16.0 \ + --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ + --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 + # via + # bleach + # gcp-docuploader + # google-auth + # python-dateutil +twine==4.0.1 \ + --hash=sha256:42026c18e394eac3e06693ee52010baa5313e4811d5a11050e7d48436cf41b9e \ + --hash=sha256:96b1cf12f7ae611a4a40b6ae8e9570215daff0611828f5fe1f37a16255ab24a0 + # via -r requirements.in +typing-extensions==4.3.0 \ + --hash=sha256:25642c956049920a5aa49edcdd6ab1e06d7e5d467fc00e0506c44ac86fbfca02 \ + --hash=sha256:e6d2677a32f47fc7eb2795db1dd15c1f34eff616bcaf2cfb5e997f854fa1c4a6 + # via -r requirements.in +urllib3==1.26.12 \ + --hash=sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e \ + --hash=sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997 + # via + # requests + # twine +virtualenv==20.16.3 \ + --hash=sha256:4193b7bc8a6cd23e4eb251ac64f29b4398ab2c233531e66e40b19a6b7b0d30c1 \ + --hash=sha256:d86ea0bb50e06252d79e6c241507cb904fcd66090c3271381372d6221a3970f9 + # via nox +webencodings==0.5.1 \ + --hash=sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78 \ + --hash=sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923 + # via bleach +wheel==0.37.1 \ + --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \ + --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4 + # via -r requirements.in +zipp==3.8.1 \ + --hash=sha256:05b45f1ee8f807d0cc928485ca40a07cb491cf092ff587c0df9cb1fd154848d2 \ + --hash=sha256:47c40d7fe183a6f21403a199b3e4192cca5774656965b0a4988ad2f8feb5f009 + # via importlib-metadata + +# The following packages are considered to be unsafe in a requirements file: +setuptools==65.2.0 \ + --hash=sha256:7f4bc85450898a09f76ebf28b72fa25bc7111f6c7d665d514a60bba9c75ef2a9 \ + --hash=sha256:a3ca5857c89f82f5c9410e8508cb32f4872a3bafd4aa7ae122a24ca33bccc750 + # via -r requirements.in From 6e8ed1f73e8fd2fe9da9bd2d16529cdc2d1c4c2e Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 17:28:21 +0000 Subject: [PATCH 02/11] chore(python): exclude path in renovate.json [autoapprove] (#173) Source-Link: https://github.com/googleapis/synthtool/commit/69fabaee9eca28af7ecaa02c86895e606fbbebd6 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:562802bfac02e012a6ac34eda282f81d06e77326b82a32d7bbb1369ff552b387 --- .github/.OwlBot.lock.yaml | 4 ++-- renovate.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 1c14d7f..c6acdf3 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:8e84e0e0d71a0d681668461bba02c9e1394c785f31a10ae3470660235b673086 -# created: 2022-08-24T15:24:05.205983455Z + digest: sha256:562802bfac02e012a6ac34eda282f81d06e77326b82a32d7bbb1369ff552b387 +# created: 2022-08-24T17:07:22.006876712Z diff --git a/renovate.json b/renovate.json index c21036d..566a70f 100644 --- a/renovate.json +++ b/renovate.json @@ -5,7 +5,7 @@ ":preserveSemverRanges", ":disableDependencyDashboard" ], - "ignorePaths": [".pre-commit-config.yaml"], + "ignorePaths": [".pre-commit-config.yaml", ".kokoro/requirements.txt"], "pip_requirements": { "fileMatch": ["requirements-test.txt", "samples/[\\S/]*constraints.txt", "samples/[\\S/]*constraints-test.txt"] } From 4a4cf3f6416f3a25a9d59be77914c556e3ac8b84 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 30 Aug 2022 08:45:05 -0400 Subject: [PATCH 03/11] chore(python): exclude `grpcio==1.49.0rc1` in tests (#174) Source-Link: https://github.com/googleapis/synthtool/commit/c4dd5953003d13b239f872d329c3146586bb417e Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:ce3c1686bc81145c81dd269bd12c4025c6b275b22d14641358827334fddb1d72 Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 4 ++-- .kokoro/requirements.txt | 6 +++--- noxfile.py | 7 +++++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index c6acdf3..23e106b 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:562802bfac02e012a6ac34eda282f81d06e77326b82a32d7bbb1369ff552b387 -# created: 2022-08-24T17:07:22.006876712Z + digest: sha256:ce3c1686bc81145c81dd269bd12c4025c6b275b22d14641358827334fddb1d72 +# created: 2022-08-29T17:28:30.441852797Z diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index c4b824f..4b29ef2 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -136,9 +136,9 @@ cryptography==37.0.4 \ # via # gcp-releasetool # secretstorage -distlib==0.3.5 \ - --hash=sha256:a7f75737c70be3b25e2bee06288cec4e4c221de18455b2dd037fe2a795cab2fe \ - --hash=sha256:b710088c59f06338ca514800ad795a132da19fda270e3ce4affc74abf955a26c +distlib==0.3.6 \ + --hash=sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46 \ + --hash=sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e # via virtualenv docutils==0.19 \ --hash=sha256:33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6 \ diff --git a/noxfile.py b/noxfile.py index cc39f3b..ffe9f35 100644 --- a/noxfile.py +++ b/noxfile.py @@ -189,7 +189,9 @@ def unit(session): def install_systemtest_dependencies(session, *constraints): # Use pre-release gRPC for system tests. - session.install("--pre", "grpcio") + # Exclude version 1.49.0rc1 which has a known issue. + # See https://github.com/grpc/grpc/pull/30642 + session.install("--pre", "grpcio!=1.49.0rc1") session.install(*SYSTEM_TEST_STANDARD_DEPENDENCIES, *constraints) @@ -369,7 +371,8 @@ def prerelease_deps(session): # dependency of grpc "six", "googleapis-common-protos", - "grpcio", + # Exclude version 1.49.0rc1 which has a known issue. See https://github.com/grpc/grpc/pull/30642 + "grpcio!=1.49.0rc1", "grpcio-status", "google-api-core", "proto-plus", From 9aa02049809b13d8f49d24c5087a1dde4951473c Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 1 Sep 2022 18:40:13 +0000 Subject: [PATCH 04/11] ci(python): fix path to requirements.txt in release script (#175) Source-Link: https://github.com/googleapis/synthtool/commit/fdba3ed145bdb2f4f3eff434d4284b1d03b80d34 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:1f0dbd02745fb7cf255563dab5968345989308544e52b7f460deadd5e78e63b0 --- .github/.OwlBot.lock.yaml | 3 +-- .kokoro/release.sh | 2 +- .kokoro/requirements.txt | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 23e106b..0d9eb2a 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:ce3c1686bc81145c81dd269bd12c4025c6b275b22d14641358827334fddb1d72 -# created: 2022-08-29T17:28:30.441852797Z + digest: sha256:1f0dbd02745fb7cf255563dab5968345989308544e52b7f460deadd5e78e63b0 diff --git a/.kokoro/release.sh b/.kokoro/release.sh index bf1e7c6..e73c02b 100755 --- a/.kokoro/release.sh +++ b/.kokoro/release.sh @@ -16,7 +16,7 @@ set -eo pipefail # Start the releasetool reporter -python3 -m pip install --require-hashes -r .kokoro/requirements.txt +python3 -m pip install --require-hashes -r github/python-data-qna/.kokoro/requirements.txt python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script # Disable buffering, so that the logs stream through. diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 4b29ef2..92b2f72 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -100,9 +100,9 @@ click==8.0.4 \ # via # gcp-docuploader # gcp-releasetool -colorlog==6.6.0 \ - --hash=sha256:344f73204009e4c83c5b6beb00b3c45dc70fcdae3c80db919e0a4171d006fde8 \ - --hash=sha256:351c51e866c86c3217f08e4b067a7974a678be78f07f85fc2d55b8babde6d94e +colorlog==6.7.0 \ + --hash=sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662 \ + --hash=sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5 # via # gcp-docuploader # nox @@ -152,9 +152,9 @@ gcp-docuploader==0.6.3 \ --hash=sha256:ba8c9d76b3bbac54b0311c503a373b00edc2dc02d6d54ea9507045adb8e870f7 \ --hash=sha256:c0f5aaa82ce1854a386197e4e359b120ad6d4e57ae2c812fce42219a3288026b # via -r requirements.in -gcp-releasetool==1.8.6 \ - --hash=sha256:42e51ab8e2e789bc8e22a03c09352962cd3452951c801a2230d564816630304a \ - --hash=sha256:a3518b79d1b243c494eac392a01c7fd65187fd6d52602dcab9b529bc934d4da1 +gcp-releasetool==1.8.7 \ + --hash=sha256:3d2a67c9db39322194afb3b427e9cb0476ce8f2a04033695f0aeb63979fc2b37 \ + --hash=sha256:5e4d28f66e90780d77f3ecf1e9155852b0c3b13cbccb08ab07e66b2357c8da8d # via -r requirements.in google-api-core==2.8.2 \ --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \ @@ -251,9 +251,9 @@ jinja2==3.1.2 \ --hash=sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852 \ --hash=sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61 # via gcp-releasetool -keyring==23.8.2 \ - --hash=sha256:0d9973f8891850f1ade5f26aafd06bb16865fbbae3fc56b0defb6a14a2624003 \ - --hash=sha256:10d2a8639663fe2090705a00b8c47c687cacdf97598ea9c11456679fa974473a +keyring==23.9.0 \ + --hash=sha256:4c32a31174faaee48f43a7e2c7e9c3216ec5e95acf22a2bebfb4a1d05056ee44 \ + --hash=sha256:98f060ec95ada2ab910c195a2d4317be6ef87936a766b239c46aa3c7aac4f0db # via # gcp-releasetool # twine @@ -440,9 +440,9 @@ urllib3==1.26.12 \ # via # requests # twine -virtualenv==20.16.3 \ - --hash=sha256:4193b7bc8a6cd23e4eb251ac64f29b4398ab2c233531e66e40b19a6b7b0d30c1 \ - --hash=sha256:d86ea0bb50e06252d79e6c241507cb904fcd66090c3271381372d6221a3970f9 +virtualenv==20.16.4 \ + --hash=sha256:014f766e4134d0008dcaa1f95bafa0fb0f575795d07cae50b1bee514185d6782 \ + --hash=sha256:035ed57acce4ac35c82c9d8802202b0e71adac011a511ff650cbcf9635006a22 # via nox webencodings==0.5.1 \ --hash=sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78 \ From 29eec608e122c36c5c2001c5771c3737c0166769 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 2 Sep 2022 00:46:20 +0000 Subject: [PATCH 05/11] chore(python): update .kokoro/requirements.txt (#176) Source-Link: https://github.com/googleapis/synthtool/commit/703554a14c7479542335b62fa69279f93a9e38ec Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:94961fdc5c9ca6d13530a6a414a49d2f607203168215d074cdb0a1df9ec31c0b --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/requirements.txt | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 0d9eb2a..2fa0f7c 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:1f0dbd02745fb7cf255563dab5968345989308544e52b7f460deadd5e78e63b0 + digest: sha256:94961fdc5c9ca6d13530a6a414a49d2f607203168215d074cdb0a1df9ec31c0b diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 92b2f72..385f2d4 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -241,6 +241,10 @@ importlib-metadata==4.12.0 \ # via # -r requirements.in # twine +jaraco-classes==3.2.2 \ + --hash=sha256:6745f113b0b588239ceb49532aa09c3ebb947433ce311ef2f8e3ad64ebb74594 \ + --hash=sha256:e6ef6fd3fcf4579a7a019d87d1e56a883f4e4c35cfe925f86731abc58804e647 + # via keyring jeepney==0.8.0 \ --hash=sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806 \ --hash=sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755 @@ -299,6 +303,10 @@ markupsafe==2.1.1 \ --hash=sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a \ --hash=sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7 # via jinja2 +more-itertools==8.14.0 \ + --hash=sha256:1bc4f91ee5b1b31ac7ceacc17c09befe6a40a503907baf9c839c229b5095cfd2 \ + --hash=sha256:c09443cd3d5438b8dafccd867a6bc1cb0894389e90cb53d227456b0b0bccb750 + # via jaraco-classes nox==2022.8.7 \ --hash=sha256:1b894940551dc5c389f9271d197ca5d655d40bdc6ccf93ed6880e4042760a34b \ --hash=sha256:96cca88779e08282a699d672258ec01eb7c792d35bbbf538c723172bce23212c From d1be5a545a5eb2f97772df10043c3ef13b5f5fcb Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 2 Sep 2022 10:16:51 -0700 Subject: [PATCH 06/11] chore(python): exclude setup.py in renovate config (#178) Source-Link: https://github.com/googleapis/synthtool/commit/56da63e80c384a871356d1ea6640802017f213b4 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:993a058718e84a82fda04c3177e58f0a43281a996c7c395e0a56ccc4d6d210d7 Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- renovate.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 2fa0f7c..b8dcb4a 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:94961fdc5c9ca6d13530a6a414a49d2f607203168215d074cdb0a1df9ec31c0b + digest: sha256:993a058718e84a82fda04c3177e58f0a43281a996c7c395e0a56ccc4d6d210d7 diff --git a/renovate.json b/renovate.json index 566a70f..39b2a0e 100644 --- a/renovate.json +++ b/renovate.json @@ -5,7 +5,7 @@ ":preserveSemverRanges", ":disableDependencyDashboard" ], - "ignorePaths": [".pre-commit-config.yaml", ".kokoro/requirements.txt"], + "ignorePaths": [".pre-commit-config.yaml", ".kokoro/requirements.txt", "setup.py"], "pip_requirements": { "fileMatch": ["requirements-test.txt", "samples/[\\S/]*constraints.txt", "samples/[\\S/]*constraints-test.txt"] } From 172c4cf6e6969e9f6e9913c531224f0be0ff3371 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 7 Sep 2022 14:18:12 +0000 Subject: [PATCH 07/11] chore: Bump gapic-generator-python version to 1.3.0 (#179) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 472561635 Source-Link: https://github.com/googleapis/googleapis/commit/332ecf599f8e747d8d1213b77ae7db26eff12814 Source-Link: https://github.com/googleapis/googleapis-gen/commit/4313d682880fd9d7247291164d4e9d3d5bd9f177 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDMxM2Q2ODI4ODBmZDlkNzI0NzI5MTE2NGQ0ZTlkM2Q1YmQ5ZjE3NyJ9 --- .../auto_suggestion_service/async_client.py | 7 + .../auto_suggestion_service/client.py | 7 + .../services/question_service/async_client.py | 37 ++- .../services/question_service/client.py | 37 ++- mypy.ini | 2 +- ...uggestion_service_suggest_queries_async.py | 7 + ...suggestion_service_suggest_queries_sync.py | 7 + ..._question_service_create_question_async.py | 9 +- ...d_question_service_create_question_sync.py | 9 +- ...question_service_execute_question_async.py | 7 + ..._question_service_execute_question_sync.py | 7 + ...ted_question_service_get_question_async.py | 7 + ...ated_question_service_get_question_sync.py | 7 + ...uestion_service_get_user_feedback_async.py | 7 + ...question_service_get_user_feedback_sync.py | 7 + ...tion_service_update_user_feedback_async.py | 7 + ...stion_service_update_user_feedback_sync.py | 7 + .../snippet_metadata_dataqna_v1alpha.json | 240 +++++++++--------- 18 files changed, 293 insertions(+), 125 deletions(-) diff --git a/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/async_client.py b/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/async_client.py index 5491a33..e813e02 100644 --- a/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/async_client.py +++ b/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/async_client.py @@ -287,6 +287,13 @@ async def suggest_queries( .. code-block:: python + # This snippet has been automatically generated and should be regarded as a + # code template only. + # It will require modifications to work: + # - It may require correct/in-range values for request initialization. + # - It may require specifying regional endpoints when creating the service + # client as shown in: + # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha async def sample_suggest_queries(): diff --git a/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/client.py b/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/client.py index 3cebcc8..77c2616 100644 --- a/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/client.py +++ b/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/client.py @@ -489,6 +489,13 @@ def suggest_queries( .. code-block:: python + # This snippet has been automatically generated and should be regarded as a + # code template only. + # It will require modifications to work: + # - It may require correct/in-range values for request initialization. + # - It may require specifying regional endpoints when creating the service + # client as shown in: + # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha def sample_suggest_queries(): diff --git a/google/cloud/dataqna_v1alpha/services/question_service/async_client.py b/google/cloud/dataqna_v1alpha/services/question_service/async_client.py index a51844e..f0e946e 100644 --- a/google/cloud/dataqna_v1alpha/services/question_service/async_client.py +++ b/google/cloud/dataqna_v1alpha/services/question_service/async_client.py @@ -244,6 +244,13 @@ async def get_question( .. code-block:: python + # This snippet has been automatically generated and should be regarded as a + # code template only. + # It will require modifications to work: + # - It may require correct/in-range values for request initialization. + # - It may require specifying regional endpoints when creating the service + # client as shown in: + # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha async def sample_get_question(): @@ -343,6 +350,13 @@ async def create_question( .. code-block:: python + # This snippet has been automatically generated and should be regarded as a + # code template only. + # It will require modifications to work: + # - It may require correct/in-range values for request initialization. + # - It may require specifying regional endpoints when creating the service + # client as shown in: + # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha async def sample_create_question(): @@ -351,7 +365,7 @@ async def sample_create_question(): # Initialize request argument(s) question = dataqna_v1alpha.Question() - question.scopes = ['scopes_value_1', 'scopes_value_2'] + question.scopes = ['scopes_value1', 'scopes_value2'] question.query = "query_value" request = dataqna_v1alpha.CreateQuestionRequest( @@ -455,6 +469,13 @@ async def execute_question( .. code-block:: python + # This snippet has been automatically generated and should be regarded as a + # code template only. + # It will require modifications to work: + # - It may require correct/in-range values for request initialization. + # - It may require specifying regional endpoints when creating the service + # client as shown in: + # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha async def sample_execute_question(): @@ -563,6 +584,13 @@ async def get_user_feedback( .. code-block:: python + # This snippet has been automatically generated and should be regarded as a + # code template only. + # It will require modifications to work: + # - It may require correct/in-range values for request initialization. + # - It may require specifying regional endpoints when creating the service + # client as shown in: + # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha async def sample_get_user_feedback(): @@ -659,6 +687,13 @@ async def update_user_feedback( .. code-block:: python + # This snippet has been automatically generated and should be regarded as a + # code template only. + # It will require modifications to work: + # - It may require correct/in-range values for request initialization. + # - It may require specifying regional endpoints when creating the service + # client as shown in: + # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha async def sample_update_user_feedback(): diff --git a/google/cloud/dataqna_v1alpha/services/question_service/client.py b/google/cloud/dataqna_v1alpha/services/question_service/client.py index 099499f..c8bd609 100644 --- a/google/cloud/dataqna_v1alpha/services/question_service/client.py +++ b/google/cloud/dataqna_v1alpha/services/question_service/client.py @@ -487,6 +487,13 @@ def get_question( .. code-block:: python + # This snippet has been automatically generated and should be regarded as a + # code template only. + # It will require modifications to work: + # - It may require correct/in-range values for request initialization. + # - It may require specifying regional endpoints when creating the service + # client as shown in: + # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha def sample_get_question(): @@ -586,6 +593,13 @@ def create_question( .. code-block:: python + # This snippet has been automatically generated and should be regarded as a + # code template only. + # It will require modifications to work: + # - It may require correct/in-range values for request initialization. + # - It may require specifying regional endpoints when creating the service + # client as shown in: + # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha def sample_create_question(): @@ -594,7 +608,7 @@ def sample_create_question(): # Initialize request argument(s) question = dataqna_v1alpha.Question() - question.scopes = ['scopes_value_1', 'scopes_value_2'] + question.scopes = ['scopes_value1', 'scopes_value2'] question.query = "query_value" request = dataqna_v1alpha.CreateQuestionRequest( @@ -698,6 +712,13 @@ def execute_question( .. code-block:: python + # This snippet has been automatically generated and should be regarded as a + # code template only. + # It will require modifications to work: + # - It may require correct/in-range values for request initialization. + # - It may require specifying regional endpoints when creating the service + # client as shown in: + # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha def sample_execute_question(): @@ -806,6 +827,13 @@ def get_user_feedback( .. code-block:: python + # This snippet has been automatically generated and should be regarded as a + # code template only. + # It will require modifications to work: + # - It may require correct/in-range values for request initialization. + # - It may require specifying regional endpoints when creating the service + # client as shown in: + # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha def sample_get_user_feedback(): @@ -902,6 +930,13 @@ def update_user_feedback( .. code-block:: python + # This snippet has been automatically generated and should be regarded as a + # code template only. + # It will require modifications to work: + # - It may require correct/in-range values for request initialization. + # - It may require specifying regional endpoints when creating the service + # client as shown in: + # https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha def sample_update_user_feedback(): diff --git a/mypy.ini b/mypy.ini index 4505b48..574c5ae 100644 --- a/mypy.ini +++ b/mypy.ini @@ -1,3 +1,3 @@ [mypy] -python_version = 3.6 +python_version = 3.7 namespace_packages = True diff --git a/samples/generated_samples/dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_async.py b/samples/generated_samples/dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_async.py index f8c0f20..72a93ad 100644 --- a/samples/generated_samples/dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_async.py +++ b/samples/generated_samples/dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_async.py @@ -24,6 +24,13 @@ # [START dataqna_v1alpha_generated_AutoSuggestionService_SuggestQueries_async] +# This snippet has been automatically generated and should be regarded as a +# code template only. +# It will require modifications to work: +# - It may require correct/in-range values for request initialization. +# - It may require specifying regional endpoints when creating the service +# client as shown in: +# https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha diff --git a/samples/generated_samples/dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync.py b/samples/generated_samples/dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync.py index 3ccda08..33ac38e 100644 --- a/samples/generated_samples/dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync.py +++ b/samples/generated_samples/dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync.py @@ -24,6 +24,13 @@ # [START dataqna_v1alpha_generated_AutoSuggestionService_SuggestQueries_sync] +# This snippet has been automatically generated and should be regarded as a +# code template only. +# It will require modifications to work: +# - It may require correct/in-range values for request initialization. +# - It may require specifying regional endpoints when creating the service +# client as shown in: +# https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_create_question_async.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_create_question_async.py index 5e85d96..c2258d8 100644 --- a/samples/generated_samples/dataqna_v1alpha_generated_question_service_create_question_async.py +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_create_question_async.py @@ -24,6 +24,13 @@ # [START dataqna_v1alpha_generated_QuestionService_CreateQuestion_async] +# This snippet has been automatically generated and should be regarded as a +# code template only. +# It will require modifications to work: +# - It may require correct/in-range values for request initialization. +# - It may require specifying regional endpoints when creating the service +# client as shown in: +# https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha @@ -33,7 +40,7 @@ async def sample_create_question(): # Initialize request argument(s) question = dataqna_v1alpha.Question() - question.scopes = ['scopes_value_1', 'scopes_value_2'] + question.scopes = ['scopes_value1', 'scopes_value2'] question.query = "query_value" request = dataqna_v1alpha.CreateQuestionRequest( diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_create_question_sync.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_create_question_sync.py index 27de918..fdf3b21 100644 --- a/samples/generated_samples/dataqna_v1alpha_generated_question_service_create_question_sync.py +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_create_question_sync.py @@ -24,6 +24,13 @@ # [START dataqna_v1alpha_generated_QuestionService_CreateQuestion_sync] +# This snippet has been automatically generated and should be regarded as a +# code template only. +# It will require modifications to work: +# - It may require correct/in-range values for request initialization. +# - It may require specifying regional endpoints when creating the service +# client as shown in: +# https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha @@ -33,7 +40,7 @@ def sample_create_question(): # Initialize request argument(s) question = dataqna_v1alpha.Question() - question.scopes = ['scopes_value_1', 'scopes_value_2'] + question.scopes = ['scopes_value1', 'scopes_value2'] question.query = "query_value" request = dataqna_v1alpha.CreateQuestionRequest( diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_execute_question_async.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_execute_question_async.py index cd1b1f4..05d4c2f 100644 --- a/samples/generated_samples/dataqna_v1alpha_generated_question_service_execute_question_async.py +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_execute_question_async.py @@ -24,6 +24,13 @@ # [START dataqna_v1alpha_generated_QuestionService_ExecuteQuestion_async] +# This snippet has been automatically generated and should be regarded as a +# code template only. +# It will require modifications to work: +# - It may require correct/in-range values for request initialization. +# - It may require specifying regional endpoints when creating the service +# client as shown in: +# https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_execute_question_sync.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_execute_question_sync.py index 5b4a5cc..fcff838 100644 --- a/samples/generated_samples/dataqna_v1alpha_generated_question_service_execute_question_sync.py +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_execute_question_sync.py @@ -24,6 +24,13 @@ # [START dataqna_v1alpha_generated_QuestionService_ExecuteQuestion_sync] +# This snippet has been automatically generated and should be regarded as a +# code template only. +# It will require modifications to work: +# - It may require correct/in-range values for request initialization. +# - It may require specifying regional endpoints when creating the service +# client as shown in: +# https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_question_async.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_question_async.py index 6ae1216..c1d6201 100644 --- a/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_question_async.py +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_question_async.py @@ -24,6 +24,13 @@ # [START dataqna_v1alpha_generated_QuestionService_GetQuestion_async] +# This snippet has been automatically generated and should be regarded as a +# code template only. +# It will require modifications to work: +# - It may require correct/in-range values for request initialization. +# - It may require specifying regional endpoints when creating the service +# client as shown in: +# https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_question_sync.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_question_sync.py index 250c851..3603021 100644 --- a/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_question_sync.py +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_question_sync.py @@ -24,6 +24,13 @@ # [START dataqna_v1alpha_generated_QuestionService_GetQuestion_sync] +# This snippet has been automatically generated and should be regarded as a +# code template only. +# It will require modifications to work: +# - It may require correct/in-range values for request initialization. +# - It may require specifying regional endpoints when creating the service +# client as shown in: +# https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_user_feedback_async.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_user_feedback_async.py index 1a05f67..a61ec12 100644 --- a/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_user_feedback_async.py +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_user_feedback_async.py @@ -24,6 +24,13 @@ # [START dataqna_v1alpha_generated_QuestionService_GetUserFeedback_async] +# This snippet has been automatically generated and should be regarded as a +# code template only. +# It will require modifications to work: +# - It may require correct/in-range values for request initialization. +# - It may require specifying regional endpoints when creating the service +# client as shown in: +# https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_user_feedback_sync.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_user_feedback_sync.py index 7f7b167..df04fd3 100644 --- a/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_user_feedback_sync.py +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_user_feedback_sync.py @@ -24,6 +24,13 @@ # [START dataqna_v1alpha_generated_QuestionService_GetUserFeedback_sync] +# This snippet has been automatically generated and should be regarded as a +# code template only. +# It will require modifications to work: +# - It may require correct/in-range values for request initialization. +# - It may require specifying regional endpoints when creating the service +# client as shown in: +# https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_update_user_feedback_async.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_update_user_feedback_async.py index 6b277bf..4e6aa3d 100644 --- a/samples/generated_samples/dataqna_v1alpha_generated_question_service_update_user_feedback_async.py +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_update_user_feedback_async.py @@ -24,6 +24,13 @@ # [START dataqna_v1alpha_generated_QuestionService_UpdateUserFeedback_async] +# This snippet has been automatically generated and should be regarded as a +# code template only. +# It will require modifications to work: +# - It may require correct/in-range values for request initialization. +# - It may require specifying regional endpoints when creating the service +# client as shown in: +# https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_update_user_feedback_sync.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_update_user_feedback_sync.py index 64b2bbf..5860acd 100644 --- a/samples/generated_samples/dataqna_v1alpha_generated_question_service_update_user_feedback_sync.py +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_update_user_feedback_sync.py @@ -24,6 +24,13 @@ # [START dataqna_v1alpha_generated_QuestionService_UpdateUserFeedback_sync] +# This snippet has been automatically generated and should be regarded as a +# code template only. +# It will require modifications to work: +# - It may require correct/in-range values for request initialization. +# - It may require specifying regional endpoints when creating the service +# client as shown in: +# https://googleapis.dev/python/google-api-core/latest/client_options.html from google.cloud import dataqna_v1alpha diff --git a/samples/generated_samples/snippet_metadata_dataqna_v1alpha.json b/samples/generated_samples/snippet_metadata_dataqna_v1alpha.json index 27e0338..3d4b8e3 100644 --- a/samples/generated_samples/snippet_metadata_dataqna_v1alpha.json +++ b/samples/generated_samples/snippet_metadata_dataqna_v1alpha.json @@ -55,33 +55,33 @@ "regionTag": "dataqna_v1alpha_generated_AutoSuggestionService_SuggestQueries_async", "segments": [ { - "end": 44, + "end": 51, "start": 27, "type": "FULL" }, { - "end": 44, + "end": 51, "start": 27, "type": "SHORT" }, { - "end": 33, - "start": 31, + "end": 40, + "start": 38, "type": "CLIENT_INITIALIZATION" }, { - "end": 38, - "start": 34, + "end": 45, + "start": 41, "type": "REQUEST_INITIALIZATION" }, { - "end": 41, - "start": 39, + "end": 48, + "start": 46, "type": "REQUEST_EXECUTION" }, { - "end": 45, - "start": 42, + "end": 52, + "start": 49, "type": "RESPONSE_HANDLING" } ], @@ -131,33 +131,33 @@ "regionTag": "dataqna_v1alpha_generated_AutoSuggestionService_SuggestQueries_sync", "segments": [ { - "end": 44, + "end": 51, "start": 27, "type": "FULL" }, { - "end": 44, + "end": 51, "start": 27, "type": "SHORT" }, { - "end": 33, - "start": 31, + "end": 40, + "start": 38, "type": "CLIENT_INITIALIZATION" }, { - "end": 38, - "start": 34, + "end": 45, + "start": 41, "type": "REQUEST_INITIALIZATION" }, { - "end": 41, - "start": 39, + "end": 48, + "start": 46, "type": "REQUEST_EXECUTION" }, { - "end": 45, - "start": 42, + "end": 52, + "start": 49, "type": "RESPONSE_HANDLING" } ], @@ -216,33 +216,33 @@ "regionTag": "dataqna_v1alpha_generated_QuestionService_CreateQuestion_async", "segments": [ { - "end": 49, + "end": 56, "start": 27, "type": "FULL" }, { - "end": 49, + "end": 56, "start": 27, "type": "SHORT" }, { - "end": 33, - "start": 31, + "end": 40, + "start": 38, "type": "CLIENT_INITIALIZATION" }, { - "end": 43, - "start": 34, + "end": 50, + "start": 41, "type": "REQUEST_INITIALIZATION" }, { - "end": 46, - "start": 44, + "end": 53, + "start": 51, "type": "REQUEST_EXECUTION" }, { - "end": 50, - "start": 47, + "end": 57, + "start": 54, "type": "RESPONSE_HANDLING" } ], @@ -300,33 +300,33 @@ "regionTag": "dataqna_v1alpha_generated_QuestionService_CreateQuestion_sync", "segments": [ { - "end": 49, + "end": 56, "start": 27, "type": "FULL" }, { - "end": 49, + "end": 56, "start": 27, "type": "SHORT" }, { - "end": 33, - "start": 31, + "end": 40, + "start": 38, "type": "CLIENT_INITIALIZATION" }, { - "end": 43, - "start": 34, + "end": 50, + "start": 41, "type": "REQUEST_INITIALIZATION" }, { - "end": 46, - "start": 44, + "end": 53, + "start": 51, "type": "REQUEST_EXECUTION" }, { - "end": 50, - "start": 47, + "end": 57, + "start": 54, "type": "RESPONSE_HANDLING" } ], @@ -385,33 +385,33 @@ "regionTag": "dataqna_v1alpha_generated_QuestionService_ExecuteQuestion_async", "segments": [ { - "end": 45, + "end": 52, "start": 27, "type": "FULL" }, { - "end": 45, + "end": 52, "start": 27, "type": "SHORT" }, { - "end": 33, - "start": 31, + "end": 40, + "start": 38, "type": "CLIENT_INITIALIZATION" }, { - "end": 39, - "start": 34, + "end": 46, + "start": 41, "type": "REQUEST_INITIALIZATION" }, { - "end": 42, - "start": 40, + "end": 49, + "start": 47, "type": "REQUEST_EXECUTION" }, { - "end": 46, - "start": 43, + "end": 53, + "start": 50, "type": "RESPONSE_HANDLING" } ], @@ -469,33 +469,33 @@ "regionTag": "dataqna_v1alpha_generated_QuestionService_ExecuteQuestion_sync", "segments": [ { - "end": 45, + "end": 52, "start": 27, "type": "FULL" }, { - "end": 45, + "end": 52, "start": 27, "type": "SHORT" }, { - "end": 33, - "start": 31, + "end": 40, + "start": 38, "type": "CLIENT_INITIALIZATION" }, { - "end": 39, - "start": 34, + "end": 46, + "start": 41, "type": "REQUEST_INITIALIZATION" }, { - "end": 42, - "start": 40, + "end": 49, + "start": 47, "type": "REQUEST_EXECUTION" }, { - "end": 46, - "start": 43, + "end": 53, + "start": 50, "type": "RESPONSE_HANDLING" } ], @@ -550,33 +550,33 @@ "regionTag": "dataqna_v1alpha_generated_QuestionService_GetQuestion_async", "segments": [ { - "end": 44, + "end": 51, "start": 27, "type": "FULL" }, { - "end": 44, + "end": 51, "start": 27, "type": "SHORT" }, { - "end": 33, - "start": 31, + "end": 40, + "start": 38, "type": "CLIENT_INITIALIZATION" }, { - "end": 38, - "start": 34, + "end": 45, + "start": 41, "type": "REQUEST_INITIALIZATION" }, { - "end": 41, - "start": 39, + "end": 48, + "start": 46, "type": "REQUEST_EXECUTION" }, { - "end": 45, - "start": 42, + "end": 52, + "start": 49, "type": "RESPONSE_HANDLING" } ], @@ -630,33 +630,33 @@ "regionTag": "dataqna_v1alpha_generated_QuestionService_GetQuestion_sync", "segments": [ { - "end": 44, + "end": 51, "start": 27, "type": "FULL" }, { - "end": 44, + "end": 51, "start": 27, "type": "SHORT" }, { - "end": 33, - "start": 31, + "end": 40, + "start": 38, "type": "CLIENT_INITIALIZATION" }, { - "end": 38, - "start": 34, + "end": 45, + "start": 41, "type": "REQUEST_INITIALIZATION" }, { - "end": 41, - "start": 39, + "end": 48, + "start": 46, "type": "REQUEST_EXECUTION" }, { - "end": 45, - "start": 42, + "end": 52, + "start": 49, "type": "RESPONSE_HANDLING" } ], @@ -711,33 +711,33 @@ "regionTag": "dataqna_v1alpha_generated_QuestionService_GetUserFeedback_async", "segments": [ { - "end": 44, + "end": 51, "start": 27, "type": "FULL" }, { - "end": 44, + "end": 51, "start": 27, "type": "SHORT" }, { - "end": 33, - "start": 31, + "end": 40, + "start": 38, "type": "CLIENT_INITIALIZATION" }, { - "end": 38, - "start": 34, + "end": 45, + "start": 41, "type": "REQUEST_INITIALIZATION" }, { - "end": 41, - "start": 39, + "end": 48, + "start": 46, "type": "REQUEST_EXECUTION" }, { - "end": 45, - "start": 42, + "end": 52, + "start": 49, "type": "RESPONSE_HANDLING" } ], @@ -791,33 +791,33 @@ "regionTag": "dataqna_v1alpha_generated_QuestionService_GetUserFeedback_sync", "segments": [ { - "end": 44, + "end": 51, "start": 27, "type": "FULL" }, { - "end": 44, + "end": 51, "start": 27, "type": "SHORT" }, { - "end": 33, - "start": 31, + "end": 40, + "start": 38, "type": "CLIENT_INITIALIZATION" }, { - "end": 38, - "start": 34, + "end": 45, + "start": 41, "type": "REQUEST_INITIALIZATION" }, { - "end": 41, - "start": 39, + "end": 48, + "start": 46, "type": "REQUEST_EXECUTION" }, { - "end": 45, - "start": 42, + "end": 52, + "start": 49, "type": "RESPONSE_HANDLING" } ], @@ -876,33 +876,33 @@ "regionTag": "dataqna_v1alpha_generated_QuestionService_UpdateUserFeedback_async", "segments": [ { - "end": 47, + "end": 54, "start": 27, "type": "FULL" }, { - "end": 47, + "end": 54, "start": 27, "type": "SHORT" }, { - "end": 33, - "start": 31, + "end": 40, + "start": 38, "type": "CLIENT_INITIALIZATION" }, { - "end": 41, - "start": 34, + "end": 48, + "start": 41, "type": "REQUEST_INITIALIZATION" }, { - "end": 44, - "start": 42, + "end": 51, + "start": 49, "type": "REQUEST_EXECUTION" }, { - "end": 48, - "start": 45, + "end": 55, + "start": 52, "type": "RESPONSE_HANDLING" } ], @@ -960,33 +960,33 @@ "regionTag": "dataqna_v1alpha_generated_QuestionService_UpdateUserFeedback_sync", "segments": [ { - "end": 47, + "end": 54, "start": 27, "type": "FULL" }, { - "end": 47, + "end": 54, "start": 27, "type": "SHORT" }, { - "end": 33, - "start": 31, + "end": 40, + "start": 38, "type": "CLIENT_INITIALIZATION" }, { - "end": 41, - "start": 34, + "end": 48, + "start": 41, "type": "REQUEST_INITIALIZATION" }, { - "end": 44, - "start": 42, + "end": 51, + "start": 49, "type": "REQUEST_EXECUTION" }, { - "end": 48, - "start": 45, + "end": 55, + "start": 52, "type": "RESPONSE_HANDLING" } ], From a4fdad9e54ec3947880753e45d4155d1cd7b8493 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 13:52:12 +0000 Subject: [PATCH 08/11] chore: use gapic-generator-python 1.3.1 (#180) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 472772457 Source-Link: https://github.com/googleapis/googleapis/commit/855b74d203deeb0f7a0215f9454cdde62a1f9b86 Source-Link: https://github.com/googleapis/googleapis-gen/commit/b64b1e7da3e138f15ca361552ef0545e54891b4f Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYjY0YjFlN2RhM2UxMzhmMTVjYTM2MTU1MmVmMDU0NWU1NDg5MWI0ZiJ9 --- .../gapic/dataqna_v1alpha/test_auto_suggestion_service.py | 4 ++-- tests/unit/gapic/dataqna_v1alpha/test_question_service.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py b/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py index 865aade..a05c152 100644 --- a/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py +++ b/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py @@ -18,8 +18,8 @@ # try/except added for compatibility with python < 3.8 try: from unittest import mock - from unittest.mock import AsyncMock -except ImportError: + from unittest.mock import AsyncMock # pragma: NO COVER +except ImportError: # pragma: NO COVER import mock import math diff --git a/tests/unit/gapic/dataqna_v1alpha/test_question_service.py b/tests/unit/gapic/dataqna_v1alpha/test_question_service.py index 551e0b9..c42222a 100644 --- a/tests/unit/gapic/dataqna_v1alpha/test_question_service.py +++ b/tests/unit/gapic/dataqna_v1alpha/test_question_service.py @@ -18,8 +18,8 @@ # try/except added for compatibility with python < 3.8 try: from unittest import mock - from unittest.mock import AsyncMock -except ImportError: + from unittest.mock import AsyncMock # pragma: NO COVER +except ImportError: # pragma: NO COVER import mock import math From a89bbbe9b0818481cdfbf0634a65df3df5e8281b Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 10:34:19 -0400 Subject: [PATCH 09/11] chore: use gapic generator python 1.4.1 (#181) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: integrate gapic-generator-python-1.4.1 and enable more py_test targets PiperOrigin-RevId: 473833416 Source-Link: https://github.com/googleapis/googleapis/commit/565a5508869557a3228b871101e4e4ebd8f93d11 Source-Link: https://github.com/googleapis/googleapis-gen/commit/1ee1a06c6de3ca8b843572c1fde0548f84236989 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMWVlMWEwNmM2ZGUzY2E4Yjg0MzU3MmMxZmRlMDU0OGY4NDIzNjk4OSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py | 1 + tests/unit/gapic/dataqna_v1alpha/test_question_service.py | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py b/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py index a05c152..3768889 100644 --- a/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py +++ b/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py @@ -33,6 +33,7 @@ from google.oauth2 import service_account import grpc from grpc.experimental import aio +from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule import pytest diff --git a/tests/unit/gapic/dataqna_v1alpha/test_question_service.py b/tests/unit/gapic/dataqna_v1alpha/test_question_service.py index c42222a..5755e22 100644 --- a/tests/unit/gapic/dataqna_v1alpha/test_question_service.py +++ b/tests/unit/gapic/dataqna_v1alpha/test_question_service.py @@ -37,6 +37,7 @@ from google.rpc import status_pb2 # type: ignore import grpc from grpc.experimental import aio +from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule import pytest From a1dea02238950fa36cfdc0bd51cab11323f3c983 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 16 Sep 2022 10:55:51 -0400 Subject: [PATCH 10/11] feat: Add support for REST transport (#182) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: enable REST transport for Python Preview clients PiperOrigin-RevId: 474571730 Source-Link: https://github.com/googleapis/googleapis/commit/5a9ee4d5deca8e3da550b0419ed336e22521fc8e Source-Link: https://github.com/googleapis/googleapis-gen/commit/ceafe521f137680fdee2f9ca9e1947cdd825070d Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiY2VhZmU1MjFmMTM3NjgwZmRlZTJmOWNhOWUxOTQ3Y2RkODI1MDcwZCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: Add Secure Boot support to TPU v2alpha1 API PiperOrigin-RevId: 474644226 Source-Link: https://github.com/googleapis/googleapis/commit/f90b329a7eb583a21a20796892b993e91e8ccf34 Source-Link: https://github.com/googleapis/googleapis-gen/commit/4ad8763bde676f92a3eb70753ae1cfed0e81387e Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGFkODc2M2JkZTY3NmY5MmEzZWI3MDc1M2FlMWNmZWQwZTgxMzg3ZSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix(deps): require google-api-core>=1.33.1,>=2.8.0 * fix(deps): require protobuf >= 3.20.1 Co-authored-by: Owl Bot Co-authored-by: Anthonios Partheniou --- .../cloud/dataqna_v1alpha/gapic_metadata.json | 40 + .../auto_suggestion_service/client.py | 5 + .../transports/__init__.py | 7 + .../transports/rest.py | 390 ++++ .../services/question_service/client.py | 5 + .../question_service/transports/__init__.py | 4 + .../question_service/transports/rest.py | 866 ++++++++ ..._service_suggest_queries_sync_d283907c.py} | 4 +- ...n_service_suggest_queries_sync_f773b5fc.py | 52 + ..._service_create_question_sync_dc8a80fc.py} | 4 +- ...n_service_create_question_sync_ddc01494.py | 57 + ...service_execute_question_sync_65ec7ecd.py} | 4 +- ..._service_execute_question_sync_af447ce0.py | 53 + ...ion_service_get_question_sync_42230e84.py} | 4 +- ...tion_service_get_question_sync_46d5ce19.py | 52 + ...ervice_get_user_feedback_sync_57510043.py} | 4 +- ...service_get_user_feedback_sync_7b0c3817.py | 52 + ...ice_update_user_feedback_sync_66ce529c.py} | 4 +- ...vice_update_user_feedback_sync_a626ced5.py | 55 + .../snippet_metadata_dataqna_v1alpha.json | 512 ++++- setup.py | 4 +- testing/constraints-3.7.txt | 4 +- .../test_auto_suggestion_service.py | 317 ++- .../dataqna_v1alpha/test_question_service.py | 1924 ++++++++++++++++- 24 files changed, 4273 insertions(+), 150 deletions(-) create mode 100644 google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/rest.py create mode 100644 google/cloud/dataqna_v1alpha/services/question_service/transports/rest.py rename samples/generated_samples/{dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync.py => dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync_d283907c.py} (97%) create mode 100644 samples/generated_samples/dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync_f773b5fc.py rename samples/generated_samples/{dataqna_v1alpha_generated_question_service_create_question_sync.py => dataqna_v1alpha_generated_question_service_create_question_sync_dc8a80fc.py} (98%) create mode 100644 samples/generated_samples/dataqna_v1alpha_generated_question_service_create_question_sync_ddc01494.py rename samples/generated_samples/{dataqna_v1alpha_generated_question_service_execute_question_sync.py => dataqna_v1alpha_generated_question_service_execute_question_sync_65ec7ecd.py} (98%) create mode 100644 samples/generated_samples/dataqna_v1alpha_generated_question_service_execute_question_sync_af447ce0.py rename samples/generated_samples/{dataqna_v1alpha_generated_question_service_get_question_sync.py => dataqna_v1alpha_generated_question_service_get_question_sync_42230e84.py} (98%) create mode 100644 samples/generated_samples/dataqna_v1alpha_generated_question_service_get_question_sync_46d5ce19.py rename samples/generated_samples/{dataqna_v1alpha_generated_question_service_get_user_feedback_sync.py => dataqna_v1alpha_generated_question_service_get_user_feedback_sync_57510043.py} (98%) create mode 100644 samples/generated_samples/dataqna_v1alpha_generated_question_service_get_user_feedback_sync_7b0c3817.py rename samples/generated_samples/{dataqna_v1alpha_generated_question_service_update_user_feedback_sync.py => dataqna_v1alpha_generated_question_service_update_user_feedback_sync_66ce529c.py} (98%) create mode 100644 samples/generated_samples/dataqna_v1alpha_generated_question_service_update_user_feedback_sync_a626ced5.py diff --git a/google/cloud/dataqna_v1alpha/gapic_metadata.json b/google/cloud/dataqna_v1alpha/gapic_metadata.json index 7ba1907..766ccd9 100644 --- a/google/cloud/dataqna_v1alpha/gapic_metadata.json +++ b/google/cloud/dataqna_v1alpha/gapic_metadata.json @@ -26,6 +26,16 @@ ] } } + }, + "rest": { + "libraryClient": "AutoSuggestionServiceClient", + "rpcs": { + "SuggestQueries": { + "methods": [ + "suggest_queries" + ] + } + } } } }, @@ -90,6 +100,36 @@ ] } } + }, + "rest": { + "libraryClient": "QuestionServiceClient", + "rpcs": { + "CreateQuestion": { + "methods": [ + "create_question" + ] + }, + "ExecuteQuestion": { + "methods": [ + "execute_question" + ] + }, + "GetQuestion": { + "methods": [ + "get_question" + ] + }, + "GetUserFeedback": { + "methods": [ + "get_user_feedback" + ] + }, + "UpdateUserFeedback": { + "methods": [ + "update_user_feedback" + ] + } + } } } } diff --git a/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/client.py b/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/client.py index 77c2616..a68ed23 100644 --- a/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/client.py +++ b/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/client.py @@ -39,6 +39,7 @@ from .transports.base import DEFAULT_CLIENT_INFO, AutoSuggestionServiceTransport from .transports.grpc import AutoSuggestionServiceGrpcTransport from .transports.grpc_asyncio import AutoSuggestionServiceGrpcAsyncIOTransport +from .transports.rest import AutoSuggestionServiceRestTransport class AutoSuggestionServiceClientMeta(type): @@ -54,6 +55,7 @@ class AutoSuggestionServiceClientMeta(type): ) # type: Dict[str, Type[AutoSuggestionServiceTransport]] _transport_registry["grpc"] = AutoSuggestionServiceGrpcTransport _transport_registry["grpc_asyncio"] = AutoSuggestionServiceGrpcAsyncIOTransport + _transport_registry["rest"] = AutoSuggestionServiceRestTransport def get_transport_class( cls, @@ -396,6 +398,9 @@ def __init__( transport (Union[str, AutoSuggestionServiceTransport]): The transport to use. If set to None, a transport is chosen automatically. + NOTE: "rest" transport functionality is currently in a + beta state (preview). We welcome your feedback via an + issue in this library's source repository. client_options (google.api_core.client_options.ClientOptions): Custom options for the client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the diff --git a/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/__init__.py b/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/__init__.py index cdaa5a5..b571458 100644 --- a/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/__init__.py +++ b/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/__init__.py @@ -19,6 +19,10 @@ from .base import AutoSuggestionServiceTransport from .grpc import AutoSuggestionServiceGrpcTransport from .grpc_asyncio import AutoSuggestionServiceGrpcAsyncIOTransport +from .rest import ( + AutoSuggestionServiceRestInterceptor, + AutoSuggestionServiceRestTransport, +) # Compile a registry of transports. _transport_registry = ( @@ -26,9 +30,12 @@ ) # type: Dict[str, Type[AutoSuggestionServiceTransport]] _transport_registry["grpc"] = AutoSuggestionServiceGrpcTransport _transport_registry["grpc_asyncio"] = AutoSuggestionServiceGrpcAsyncIOTransport +_transport_registry["rest"] = AutoSuggestionServiceRestTransport __all__ = ( "AutoSuggestionServiceTransport", "AutoSuggestionServiceGrpcTransport", "AutoSuggestionServiceGrpcAsyncIOTransport", + "AutoSuggestionServiceRestTransport", + "AutoSuggestionServiceRestInterceptor", ) diff --git a/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/rest.py b/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/rest.py new file mode 100644 index 0000000..36732f9 --- /dev/null +++ b/google/cloud/dataqna_v1alpha/services/auto_suggestion_service/transports/rest.py @@ -0,0 +1,390 @@ +# -*- coding: utf-8 -*- +# Copyright 2022 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 +# +# http://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. +# + +import dataclasses +import json # type: ignore +import re +from typing import Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + +from google.api_core import gapic_v1, path_template, rest_helpers, rest_streaming +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.protobuf import json_format +import grpc # type: ignore +from requests import __version__ as requests_version + +try: + OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] +except AttributeError: # pragma: NO COVER + OptionalRetry = Union[retries.Retry, object] # type: ignore + + +from google.cloud.dataqna_v1alpha.types import auto_suggestion_service + +from .base import AutoSuggestionServiceTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO + +DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( + gapic_version=BASE_DEFAULT_CLIENT_INFO.gapic_version, + grpc_version=None, + rest_version=requests_version, +) + + +class AutoSuggestionServiceRestInterceptor: + """Interceptor for AutoSuggestionService. + + Interceptors are used to manipulate requests, request metadata, and responses + in arbitrary ways. + Example use cases include: + * Logging + * Verifying requests according to service or custom semantics + * Stripping extraneous information from responses + + These use cases and more can be enabled by injecting an + instance of a custom subclass when constructing the AutoSuggestionServiceRestTransport. + + .. code-block:: python + class MyCustomAutoSuggestionServiceInterceptor(AutoSuggestionServiceRestInterceptor): + def pre_suggest_queries(request, metadata): + logging.log(f"Received request: {request}") + return request, metadata + + def post_suggest_queries(response): + logging.log(f"Received response: {response}") + + transport = AutoSuggestionServiceRestTransport(interceptor=MyCustomAutoSuggestionServiceInterceptor()) + client = AutoSuggestionServiceClient(transport=transport) + + + """ + + def pre_suggest_queries( + self, + request: auto_suggestion_service.SuggestQueriesRequest, + metadata: Sequence[Tuple[str, str]], + ) -> Tuple[ + auto_suggestion_service.SuggestQueriesRequest, Sequence[Tuple[str, str]] + ]: + """Pre-rpc interceptor for suggest_queries + + Override in a subclass to manipulate the request or metadata + before they are sent to the AutoSuggestionService server. + """ + return request, metadata + + def post_suggest_queries( + self, response: auto_suggestion_service.SuggestQueriesResponse + ) -> auto_suggestion_service.SuggestQueriesResponse: + """Post-rpc interceptor for suggest_queries + + Override in a subclass to manipulate the response + after it is returned by the AutoSuggestionService server but before + it is returned to user code. + """ + return response + + +@dataclasses.dataclass +class AutoSuggestionServiceRestStub: + _session: AuthorizedSession + _host: str + _interceptor: AutoSuggestionServiceRestInterceptor + + +class AutoSuggestionServiceRestTransport(AutoSuggestionServiceTransport): + """REST backend transport for AutoSuggestionService. + + This stateless API provides automatic suggestions for natural + language queries for the data sources in the provided project and + location. + + The service provides a resourceless operation ``suggestQueries`` + that can be called to get a list of suggestions for a given + incomplete query and scope (or list of scopes) under which the query + is to be interpreted. + + There are two types of suggestions, ENTITY for single entity + suggestions and TEMPLATE for full sentences. By default, both types + are returned. + + Example Request: + + :: + + GetSuggestions({ + parent: "locations/us/projects/my-project" + scopes: + "//bigquery.googleapis.com/projects/my-project/datasets/my-dataset/tables/my-table" + query: "top it" + }) + + The service will retrieve information based on the given scope(s) + and give suggestions based on that (e.g. "top item" for "top it" if + "item" is a known dimension for the provided scope). + + :: + + suggestions { + suggestion_info { + annotated_suggestion { + text_formatted: "top item by sum of usd_revenue_net" + markups { + type: DIMENSION + start_char_index: 4 + length: 4 + } + markups { + type: METRIC + start_char_index: 19 + length: 15 + } + } + query_matches { + start_char_index: 0 + length: 6 + } + } + suggestion_type: TEMPLATE + ranking_score: 0.9 + } + suggestions { + suggestion_info { + annotated_suggestion { + text_formatted: "item" + markups { + type: DIMENSION + start_char_index: 4 + length: 2 + } + } + query_matches { + start_char_index: 0 + length: 6 + } + } + suggestion_type: ENTITY + ranking_score: 0.8 + } + + This class defines the same methods as the primary client, so the + primary client can load the underlying transport implementation + and call it. + + It sends JSON representations of protocol buffers over HTTP/1.1 + + NOTE: This REST transport functionality is currently in a beta + state (preview). We welcome your feedback via an issue in this + library's source repository. Thank you! + """ + + def __init__( + self, + *, + host: str = "dataqna.googleapis.com", + credentials: ga_credentials.Credentials = None, + credentials_file: str = None, + scopes: Sequence[str] = None, + client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, + quota_project_id: Optional[str] = None, + client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, + always_use_jwt_access: Optional[bool] = False, + url_scheme: str = "https", + interceptor: Optional[AutoSuggestionServiceRestInterceptor] = None, + api_audience: Optional[str] = None, + ) -> None: + """Instantiate the transport. + + NOTE: This REST transport functionality is currently in a beta + state (preview). We welcome your feedback via a GitHub issue in + this library's repository. Thank you! + + Args: + host (Optional[str]): + The hostname to connect to. + credentials (Optional[google.auth.credentials.Credentials]): The + authorization credentials to attach to requests. These + credentials identify the application to the service; if none + are specified, the client will attempt to ascertain the + credentials from the environment. + + credentials_file (Optional[str]): A file with credentials that can + be loaded with :func:`google.auth.load_credentials_from_file`. + This argument is ignored if ``channel`` is provided. + scopes (Optional(Sequence[str])): A list of scopes. This argument is + ignored if ``channel`` is provided. + client_cert_source_for_mtls (Callable[[], Tuple[bytes, bytes]]): Client + certificate to configure mutual TLS HTTP channel. It is ignored + if ``channel`` is provided. + quota_project_id (Optional[str]): An optional project to use for billing + and quota. + client_info (google.api_core.gapic_v1.client_info.ClientInfo): + The client info used to send a user-agent string along with + API requests. If ``None``, then default info will be used. + Generally, you only need to set this if you are developing + your own client library. + always_use_jwt_access (Optional[bool]): Whether self signed JWT should + be used for service account credentials. + url_scheme: the protocol scheme for the API endpoint. Normally + "https", but for testing or local servers, + "http" can be specified. + """ + # Run the base constructor + # TODO(yon-mg): resolve other ctor params i.e. scopes, quota, etc. + # TODO: When custom host (api_endpoint) is set, `scopes` must *also* be set on the + # credentials object + maybe_url_match = re.match("^(?Phttp(?:s)?://)?(?P.*)$", host) + if maybe_url_match is None: + raise ValueError( + f"Unexpected hostname structure: {host}" + ) # pragma: NO COVER + + url_match_items = maybe_url_match.groupdict() + + host = f"{url_scheme}://{host}" if not url_match_items["scheme"] else host + + super().__init__( + host=host, + credentials=credentials, + client_info=client_info, + always_use_jwt_access=always_use_jwt_access, + api_audience=api_audience, + ) + self._session = AuthorizedSession( + self._credentials, default_host=self.DEFAULT_HOST + ) + if client_cert_source_for_mtls: + self._session.configure_mtls_channel(client_cert_source_for_mtls) + self._interceptor = interceptor or AutoSuggestionServiceRestInterceptor() + self._prep_wrapped_messages(client_info) + + class _SuggestQueries(AutoSuggestionServiceRestStub): + def __hash__(self): + return hash("SuggestQueries") + + __REQUIRED_FIELDS_DEFAULT_VALUES: Dict[str, str] = {} + + @classmethod + def _get_unset_required_fields(cls, message_dict): + return { + k: v + for k, v in cls.__REQUIRED_FIELDS_DEFAULT_VALUES.items() + if k not in message_dict + } + + def __call__( + self, + request: auto_suggestion_service.SuggestQueriesRequest, + *, + retry: OptionalRetry = gapic_v1.method.DEFAULT, + timeout: float = None, + metadata: Sequence[Tuple[str, str]] = (), + ) -> auto_suggestion_service.SuggestQueriesResponse: + r"""Call the suggest queries method over HTTP. + + Args: + request (~.auto_suggestion_service.SuggestQueriesRequest): + The request object. Request for query suggestions. + retry (google.api_core.retry.Retry): Designation of what errors, if any, + should be retried. + timeout (float): The timeout for this request. + metadata (Sequence[Tuple[str, str]]): Strings which should be + sent along with the request as metadata. + + Returns: + ~.auto_suggestion_service.SuggestQueriesResponse: + Response to SuggestQueries. + """ + + http_options: List[Dict[str, str]] = [ + { + "method": "post", + "uri": "/v1alpha/{parent=projects/*/locations/*}:suggestQueries", + "body": "*", + }, + ] + request, metadata = self._interceptor.pre_suggest_queries(request, metadata) + pb_request = auto_suggestion_service.SuggestQueriesRequest.pb(request) + transcoded_request = path_template.transcode(http_options, pb_request) + + # Jsonify the request body + + body = json_format.MessageToJson( + transcoded_request["body"], + including_default_value_fields=False, + use_integers_for_enums=False, + ) + uri = transcoded_request["uri"] + method = transcoded_request["method"] + + # Jsonify the query params + query_params = json.loads( + json_format.MessageToJson( + transcoded_request["query_params"], + including_default_value_fields=False, + use_integers_for_enums=False, + ) + ) + query_params.update(self._get_unset_required_fields(query_params)) + + # Send the request + headers = dict(metadata) + headers["Content-Type"] = "application/json" + response = getattr(self._session, method)( + "{host}{uri}".format(host=self._host, uri=uri), + timeout=timeout, + headers=headers, + params=rest_helpers.flatten_query_params(query_params, strict=True), + data=body, + ) + + # In case of error, raise the appropriate core_exceptions.GoogleAPICallError exception + # subclass. + if response.status_code >= 400: + raise core_exceptions.from_http_response(response) + + # Return the response + resp = auto_suggestion_service.SuggestQueriesResponse() + pb_resp = auto_suggestion_service.SuggestQueriesResponse.pb(resp) + + json_format.Parse(response.content, pb_resp, ignore_unknown_fields=True) + resp = self._interceptor.post_suggest_queries(resp) + return resp + + @property + def suggest_queries( + self, + ) -> Callable[ + [auto_suggestion_service.SuggestQueriesRequest], + auto_suggestion_service.SuggestQueriesResponse, + ]: + # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. + # In C++ this would require a dynamic_cast + return self._SuggestQueries(self._session, self._host, self._interceptor) # type: ignore + + @property + def kind(self) -> str: + return "rest" + + def close(self): + self._session.close() + + +__all__ = ("AutoSuggestionServiceRestTransport",) diff --git a/google/cloud/dataqna_v1alpha/services/question_service/client.py b/google/cloud/dataqna_v1alpha/services/question_service/client.py index c8bd609..830e9c6 100644 --- a/google/cloud/dataqna_v1alpha/services/question_service/client.py +++ b/google/cloud/dataqna_v1alpha/services/question_service/client.py @@ -47,6 +47,7 @@ from .transports.base import DEFAULT_CLIENT_INFO, QuestionServiceTransport from .transports.grpc import QuestionServiceGrpcTransport from .transports.grpc_asyncio import QuestionServiceGrpcAsyncIOTransport +from .transports.rest import QuestionServiceRestTransport class QuestionServiceClientMeta(type): @@ -62,6 +63,7 @@ class QuestionServiceClientMeta(type): ) # type: Dict[str, Type[QuestionServiceTransport]] _transport_registry["grpc"] = QuestionServiceGrpcTransport _transport_registry["grpc_asyncio"] = QuestionServiceGrpcAsyncIOTransport + _transport_registry["rest"] = QuestionServiceRestTransport def get_transport_class( cls, @@ -394,6 +396,9 @@ def __init__( transport (Union[str, QuestionServiceTransport]): The transport to use. If set to None, a transport is chosen automatically. + NOTE: "rest" transport functionality is currently in a + beta state (preview). We welcome your feedback via an + issue in this library's source repository. client_options (google.api_core.client_options.ClientOptions): Custom options for the client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the diff --git a/google/cloud/dataqna_v1alpha/services/question_service/transports/__init__.py b/google/cloud/dataqna_v1alpha/services/question_service/transports/__init__.py index 80e9be5..4c4b16b 100644 --- a/google/cloud/dataqna_v1alpha/services/question_service/transports/__init__.py +++ b/google/cloud/dataqna_v1alpha/services/question_service/transports/__init__.py @@ -19,14 +19,18 @@ from .base import QuestionServiceTransport from .grpc import QuestionServiceGrpcTransport from .grpc_asyncio import QuestionServiceGrpcAsyncIOTransport +from .rest import QuestionServiceRestInterceptor, QuestionServiceRestTransport # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[QuestionServiceTransport]] _transport_registry["grpc"] = QuestionServiceGrpcTransport _transport_registry["grpc_asyncio"] = QuestionServiceGrpcAsyncIOTransport +_transport_registry["rest"] = QuestionServiceRestTransport __all__ = ( "QuestionServiceTransport", "QuestionServiceGrpcTransport", "QuestionServiceGrpcAsyncIOTransport", + "QuestionServiceRestTransport", + "QuestionServiceRestInterceptor", ) diff --git a/google/cloud/dataqna_v1alpha/services/question_service/transports/rest.py b/google/cloud/dataqna_v1alpha/services/question_service/transports/rest.py new file mode 100644 index 0000000..375af1f --- /dev/null +++ b/google/cloud/dataqna_v1alpha/services/question_service/transports/rest.py @@ -0,0 +1,866 @@ +# -*- coding: utf-8 -*- +# Copyright 2022 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 +# +# http://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. +# + +import dataclasses +import json # type: ignore +import re +from typing import Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + +from google.api_core import gapic_v1, path_template, rest_helpers, rest_streaming +from google.api_core import exceptions as core_exceptions +from google.api_core import retry as retries +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.protobuf import json_format +import grpc # type: ignore +from requests import __version__ as requests_version + +try: + OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] +except AttributeError: # pragma: NO COVER + OptionalRetry = Union[retries.Retry, object] # type: ignore + + +from google.cloud.dataqna_v1alpha.types import user_feedback as gcd_user_feedback +from google.cloud.dataqna_v1alpha.types import question +from google.cloud.dataqna_v1alpha.types import question as gcd_question +from google.cloud.dataqna_v1alpha.types import question_service +from google.cloud.dataqna_v1alpha.types import user_feedback + +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO +from .base import QuestionServiceTransport + +DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( + gapic_version=BASE_DEFAULT_CLIENT_INFO.gapic_version, + grpc_version=None, + rest_version=requests_version, +) + + +class QuestionServiceRestInterceptor: + """Interceptor for QuestionService. + + Interceptors are used to manipulate requests, request metadata, and responses + in arbitrary ways. + Example use cases include: + * Logging + * Verifying requests according to service or custom semantics + * Stripping extraneous information from responses + + These use cases and more can be enabled by injecting an + instance of a custom subclass when constructing the QuestionServiceRestTransport. + + .. code-block:: python + class MyCustomQuestionServiceInterceptor(QuestionServiceRestInterceptor): + def pre_create_question(request, metadata): + logging.log(f"Received request: {request}") + return request, metadata + + def post_create_question(response): + logging.log(f"Received response: {response}") + + def pre_execute_question(request, metadata): + logging.log(f"Received request: {request}") + return request, metadata + + def post_execute_question(response): + logging.log(f"Received response: {response}") + + def pre_get_question(request, metadata): + logging.log(f"Received request: {request}") + return request, metadata + + def post_get_question(response): + logging.log(f"Received response: {response}") + + def pre_get_user_feedback(request, metadata): + logging.log(f"Received request: {request}") + return request, metadata + + def post_get_user_feedback(response): + logging.log(f"Received response: {response}") + + def pre_update_user_feedback(request, metadata): + logging.log(f"Received request: {request}") + return request, metadata + + def post_update_user_feedback(response): + logging.log(f"Received response: {response}") + + transport = QuestionServiceRestTransport(interceptor=MyCustomQuestionServiceInterceptor()) + client = QuestionServiceClient(transport=transport) + + + """ + + def pre_create_question( + self, + request: question_service.CreateQuestionRequest, + metadata: Sequence[Tuple[str, str]], + ) -> Tuple[question_service.CreateQuestionRequest, Sequence[Tuple[str, str]]]: + """Pre-rpc interceptor for create_question + + Override in a subclass to manipulate the request or metadata + before they are sent to the QuestionService server. + """ + return request, metadata + + def post_create_question( + self, response: gcd_question.Question + ) -> gcd_question.Question: + """Post-rpc interceptor for create_question + + Override in a subclass to manipulate the response + after it is returned by the QuestionService server but before + it is returned to user code. + """ + return response + + def pre_execute_question( + self, + request: question_service.ExecuteQuestionRequest, + metadata: Sequence[Tuple[str, str]], + ) -> Tuple[question_service.ExecuteQuestionRequest, Sequence[Tuple[str, str]]]: + """Pre-rpc interceptor for execute_question + + Override in a subclass to manipulate the request or metadata + before they are sent to the QuestionService server. + """ + return request, metadata + + def post_execute_question(self, response: question.Question) -> question.Question: + """Post-rpc interceptor for execute_question + + Override in a subclass to manipulate the response + after it is returned by the QuestionService server but before + it is returned to user code. + """ + return response + + def pre_get_question( + self, + request: question_service.GetQuestionRequest, + metadata: Sequence[Tuple[str, str]], + ) -> Tuple[question_service.GetQuestionRequest, Sequence[Tuple[str, str]]]: + """Pre-rpc interceptor for get_question + + Override in a subclass to manipulate the request or metadata + before they are sent to the QuestionService server. + """ + return request, metadata + + def post_get_question(self, response: question.Question) -> question.Question: + """Post-rpc interceptor for get_question + + Override in a subclass to manipulate the response + after it is returned by the QuestionService server but before + it is returned to user code. + """ + return response + + def pre_get_user_feedback( + self, + request: question_service.GetUserFeedbackRequest, + metadata: Sequence[Tuple[str, str]], + ) -> Tuple[question_service.GetUserFeedbackRequest, Sequence[Tuple[str, str]]]: + """Pre-rpc interceptor for get_user_feedback + + Override in a subclass to manipulate the request or metadata + before they are sent to the QuestionService server. + """ + return request, metadata + + def post_get_user_feedback( + self, response: user_feedback.UserFeedback + ) -> user_feedback.UserFeedback: + """Post-rpc interceptor for get_user_feedback + + Override in a subclass to manipulate the response + after it is returned by the QuestionService server but before + it is returned to user code. + """ + return response + + def pre_update_user_feedback( + self, + request: question_service.UpdateUserFeedbackRequest, + metadata: Sequence[Tuple[str, str]], + ) -> Tuple[question_service.UpdateUserFeedbackRequest, Sequence[Tuple[str, str]]]: + """Pre-rpc interceptor for update_user_feedback + + Override in a subclass to manipulate the request or metadata + before they are sent to the QuestionService server. + """ + return request, metadata + + def post_update_user_feedback( + self, response: gcd_user_feedback.UserFeedback + ) -> gcd_user_feedback.UserFeedback: + """Post-rpc interceptor for update_user_feedback + + Override in a subclass to manipulate the response + after it is returned by the QuestionService server but before + it is returned to user code. + """ + return response + + +@dataclasses.dataclass +class QuestionServiceRestStub: + _session: AuthorizedSession + _host: str + _interceptor: QuestionServiceRestInterceptor + + +class QuestionServiceRestTransport(QuestionServiceTransport): + """REST backend transport for QuestionService. + + Service to interpret natural language queries. The service allows to + create ``Question`` resources that are interpreted and are filled + with one or more interpretations if the question could be + interpreted. Once a ``Question`` resource is created and has at + least one interpretation, an interpretation can be chosen for + execution, which triggers a query to the backend (for BigQuery, it + will create a job). Upon successful execution of that + interpretation, backend specific information will be returned so + that the client can retrieve the results from the backend. + + The ``Question`` resources are named + ``projects/*/locations/*/questions/*``. + + The ``Question`` resource has a singletion sub-resource + ``UserFeedback`` named + ``projects/*/locations/*/questions/*/userFeedback``, which allows + access to user feedback. + + This class defines the same methods as the primary client, so the + primary client can load the underlying transport implementation + and call it. + + It sends JSON representations of protocol buffers over HTTP/1.1 + + NOTE: This REST transport functionality is currently in a beta + state (preview). We welcome your feedback via an issue in this + library's source repository. Thank you! + """ + + def __init__( + self, + *, + host: str = "dataqna.googleapis.com", + credentials: ga_credentials.Credentials = None, + credentials_file: str = None, + scopes: Sequence[str] = None, + client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, + quota_project_id: Optional[str] = None, + client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, + always_use_jwt_access: Optional[bool] = False, + url_scheme: str = "https", + interceptor: Optional[QuestionServiceRestInterceptor] = None, + api_audience: Optional[str] = None, + ) -> None: + """Instantiate the transport. + + NOTE: This REST transport functionality is currently in a beta + state (preview). We welcome your feedback via a GitHub issue in + this library's repository. Thank you! + + Args: + host (Optional[str]): + The hostname to connect to. + credentials (Optional[google.auth.credentials.Credentials]): The + authorization credentials to attach to requests. These + credentials identify the application to the service; if none + are specified, the client will attempt to ascertain the + credentials from the environment. + + credentials_file (Optional[str]): A file with credentials that can + be loaded with :func:`google.auth.load_credentials_from_file`. + This argument is ignored if ``channel`` is provided. + scopes (Optional(Sequence[str])): A list of scopes. This argument is + ignored if ``channel`` is provided. + client_cert_source_for_mtls (Callable[[], Tuple[bytes, bytes]]): Client + certificate to configure mutual TLS HTTP channel. It is ignored + if ``channel`` is provided. + quota_project_id (Optional[str]): An optional project to use for billing + and quota. + client_info (google.api_core.gapic_v1.client_info.ClientInfo): + The client info used to send a user-agent string along with + API requests. If ``None``, then default info will be used. + Generally, you only need to set this if you are developing + your own client library. + always_use_jwt_access (Optional[bool]): Whether self signed JWT should + be used for service account credentials. + url_scheme: the protocol scheme for the API endpoint. Normally + "https", but for testing or local servers, + "http" can be specified. + """ + # Run the base constructor + # TODO(yon-mg): resolve other ctor params i.e. scopes, quota, etc. + # TODO: When custom host (api_endpoint) is set, `scopes` must *also* be set on the + # credentials object + maybe_url_match = re.match("^(?Phttp(?:s)?://)?(?P.*)$", host) + if maybe_url_match is None: + raise ValueError( + f"Unexpected hostname structure: {host}" + ) # pragma: NO COVER + + url_match_items = maybe_url_match.groupdict() + + host = f"{url_scheme}://{host}" if not url_match_items["scheme"] else host + + super().__init__( + host=host, + credentials=credentials, + client_info=client_info, + always_use_jwt_access=always_use_jwt_access, + api_audience=api_audience, + ) + self._session = AuthorizedSession( + self._credentials, default_host=self.DEFAULT_HOST + ) + if client_cert_source_for_mtls: + self._session.configure_mtls_channel(client_cert_source_for_mtls) + self._interceptor = interceptor or QuestionServiceRestInterceptor() + self._prep_wrapped_messages(client_info) + + class _CreateQuestion(QuestionServiceRestStub): + def __hash__(self): + return hash("CreateQuestion") + + __REQUIRED_FIELDS_DEFAULT_VALUES: Dict[str, str] = {} + + @classmethod + def _get_unset_required_fields(cls, message_dict): + return { + k: v + for k, v in cls.__REQUIRED_FIELDS_DEFAULT_VALUES.items() + if k not in message_dict + } + + def __call__( + self, + request: question_service.CreateQuestionRequest, + *, + retry: OptionalRetry = gapic_v1.method.DEFAULT, + timeout: float = None, + metadata: Sequence[Tuple[str, str]] = (), + ) -> gcd_question.Question: + r"""Call the create question method over HTTP. + + Args: + request (~.question_service.CreateQuestionRequest): + The request object. Request to create a question + resource. + + retry (google.api_core.retry.Retry): Designation of what errors, if any, + should be retried. + timeout (float): The timeout for this request. + metadata (Sequence[Tuple[str, str]]): Strings which should be + sent along with the request as metadata. + + Returns: + ~.gcd_question.Question: + The question resource represents a + natural language query, its settings, + understanding generated by the system, + and answer retrieval status. A question + cannot be modified. + + """ + + http_options: List[Dict[str, str]] = [ + { + "method": "post", + "uri": "/v1alpha/{parent=projects/*/locations/*}/questions", + "body": "question", + }, + ] + request, metadata = self._interceptor.pre_create_question(request, metadata) + pb_request = question_service.CreateQuestionRequest.pb(request) + transcoded_request = path_template.transcode(http_options, pb_request) + + # Jsonify the request body + + body = json_format.MessageToJson( + transcoded_request["body"], + including_default_value_fields=False, + use_integers_for_enums=False, + ) + uri = transcoded_request["uri"] + method = transcoded_request["method"] + + # Jsonify the query params + query_params = json.loads( + json_format.MessageToJson( + transcoded_request["query_params"], + including_default_value_fields=False, + use_integers_for_enums=False, + ) + ) + query_params.update(self._get_unset_required_fields(query_params)) + + # Send the request + headers = dict(metadata) + headers["Content-Type"] = "application/json" + response = getattr(self._session, method)( + "{host}{uri}".format(host=self._host, uri=uri), + timeout=timeout, + headers=headers, + params=rest_helpers.flatten_query_params(query_params, strict=True), + data=body, + ) + + # In case of error, raise the appropriate core_exceptions.GoogleAPICallError exception + # subclass. + if response.status_code >= 400: + raise core_exceptions.from_http_response(response) + + # Return the response + resp = gcd_question.Question() + pb_resp = gcd_question.Question.pb(resp) + + json_format.Parse(response.content, pb_resp, ignore_unknown_fields=True) + resp = self._interceptor.post_create_question(resp) + return resp + + class _ExecuteQuestion(QuestionServiceRestStub): + def __hash__(self): + return hash("ExecuteQuestion") + + __REQUIRED_FIELDS_DEFAULT_VALUES: Dict[str, str] = {} + + @classmethod + def _get_unset_required_fields(cls, message_dict): + return { + k: v + for k, v in cls.__REQUIRED_FIELDS_DEFAULT_VALUES.items() + if k not in message_dict + } + + def __call__( + self, + request: question_service.ExecuteQuestionRequest, + *, + retry: OptionalRetry = gapic_v1.method.DEFAULT, + timeout: float = None, + metadata: Sequence[Tuple[str, str]] = (), + ) -> question.Question: + r"""Call the execute question method over HTTP. + + Args: + request (~.question_service.ExecuteQuestionRequest): + The request object. Request to execute an interpretation. + retry (google.api_core.retry.Retry): Designation of what errors, if any, + should be retried. + timeout (float): The timeout for this request. + metadata (Sequence[Tuple[str, str]]): Strings which should be + sent along with the request as metadata. + + Returns: + ~.question.Question: + The question resource represents a + natural language query, its settings, + understanding generated by the system, + and answer retrieval status. A question + cannot be modified. + + """ + + http_options: List[Dict[str, str]] = [ + { + "method": "post", + "uri": "/v1alpha/{name=projects/*/locations/*/questions/*}:execute", + "body": "*", + }, + ] + request, metadata = self._interceptor.pre_execute_question( + request, metadata + ) + pb_request = question_service.ExecuteQuestionRequest.pb(request) + transcoded_request = path_template.transcode(http_options, pb_request) + + # Jsonify the request body + + body = json_format.MessageToJson( + transcoded_request["body"], + including_default_value_fields=False, + use_integers_for_enums=False, + ) + uri = transcoded_request["uri"] + method = transcoded_request["method"] + + # Jsonify the query params + query_params = json.loads( + json_format.MessageToJson( + transcoded_request["query_params"], + including_default_value_fields=False, + use_integers_for_enums=False, + ) + ) + query_params.update(self._get_unset_required_fields(query_params)) + + # Send the request + headers = dict(metadata) + headers["Content-Type"] = "application/json" + response = getattr(self._session, method)( + "{host}{uri}".format(host=self._host, uri=uri), + timeout=timeout, + headers=headers, + params=rest_helpers.flatten_query_params(query_params, strict=True), + data=body, + ) + + # In case of error, raise the appropriate core_exceptions.GoogleAPICallError exception + # subclass. + if response.status_code >= 400: + raise core_exceptions.from_http_response(response) + + # Return the response + resp = question.Question() + pb_resp = question.Question.pb(resp) + + json_format.Parse(response.content, pb_resp, ignore_unknown_fields=True) + resp = self._interceptor.post_execute_question(resp) + return resp + + class _GetQuestion(QuestionServiceRestStub): + def __hash__(self): + return hash("GetQuestion") + + __REQUIRED_FIELDS_DEFAULT_VALUES: Dict[str, str] = {} + + @classmethod + def _get_unset_required_fields(cls, message_dict): + return { + k: v + for k, v in cls.__REQUIRED_FIELDS_DEFAULT_VALUES.items() + if k not in message_dict + } + + def __call__( + self, + request: question_service.GetQuestionRequest, + *, + retry: OptionalRetry = gapic_v1.method.DEFAULT, + timeout: float = None, + metadata: Sequence[Tuple[str, str]] = (), + ) -> question.Question: + r"""Call the get question method over HTTP. + + Args: + request (~.question_service.GetQuestionRequest): + The request object. A request to get a previously created + question. + + retry (google.api_core.retry.Retry): Designation of what errors, if any, + should be retried. + timeout (float): The timeout for this request. + metadata (Sequence[Tuple[str, str]]): Strings which should be + sent along with the request as metadata. + + Returns: + ~.question.Question: + The question resource represents a + natural language query, its settings, + understanding generated by the system, + and answer retrieval status. A question + cannot be modified. + + """ + + http_options: List[Dict[str, str]] = [ + { + "method": "get", + "uri": "/v1alpha/{name=projects/*/locations/*/questions/*}", + }, + ] + request, metadata = self._interceptor.pre_get_question(request, metadata) + pb_request = question_service.GetQuestionRequest.pb(request) + transcoded_request = path_template.transcode(http_options, pb_request) + + uri = transcoded_request["uri"] + method = transcoded_request["method"] + + # Jsonify the query params + query_params = json.loads( + json_format.MessageToJson( + transcoded_request["query_params"], + including_default_value_fields=False, + use_integers_for_enums=False, + ) + ) + query_params.update(self._get_unset_required_fields(query_params)) + + # Send the request + headers = dict(metadata) + headers["Content-Type"] = "application/json" + response = getattr(self._session, method)( + "{host}{uri}".format(host=self._host, uri=uri), + timeout=timeout, + headers=headers, + params=rest_helpers.flatten_query_params(query_params, strict=True), + ) + + # In case of error, raise the appropriate core_exceptions.GoogleAPICallError exception + # subclass. + if response.status_code >= 400: + raise core_exceptions.from_http_response(response) + + # Return the response + resp = question.Question() + pb_resp = question.Question.pb(resp) + + json_format.Parse(response.content, pb_resp, ignore_unknown_fields=True) + resp = self._interceptor.post_get_question(resp) + return resp + + class _GetUserFeedback(QuestionServiceRestStub): + def __hash__(self): + return hash("GetUserFeedback") + + __REQUIRED_FIELDS_DEFAULT_VALUES: Dict[str, str] = {} + + @classmethod + def _get_unset_required_fields(cls, message_dict): + return { + k: v + for k, v in cls.__REQUIRED_FIELDS_DEFAULT_VALUES.items() + if k not in message_dict + } + + def __call__( + self, + request: question_service.GetUserFeedbackRequest, + *, + retry: OptionalRetry = gapic_v1.method.DEFAULT, + timeout: float = None, + metadata: Sequence[Tuple[str, str]] = (), + ) -> user_feedback.UserFeedback: + r"""Call the get user feedback method over HTTP. + + Args: + request (~.question_service.GetUserFeedbackRequest): + The request object. Request to get user feedback. + retry (google.api_core.retry.Retry): Designation of what errors, if any, + should be retried. + timeout (float): The timeout for this request. + metadata (Sequence[Tuple[str, str]]): Strings which should be + sent along with the request as metadata. + + Returns: + ~.user_feedback.UserFeedback: + Feedback provided by a user. + """ + + http_options: List[Dict[str, str]] = [ + { + "method": "get", + "uri": "/v1alpha/{name=projects/*/locations/*/questions/*/userFeedback}", + }, + ] + request, metadata = self._interceptor.pre_get_user_feedback( + request, metadata + ) + pb_request = question_service.GetUserFeedbackRequest.pb(request) + transcoded_request = path_template.transcode(http_options, pb_request) + + uri = transcoded_request["uri"] + method = transcoded_request["method"] + + # Jsonify the query params + query_params = json.loads( + json_format.MessageToJson( + transcoded_request["query_params"], + including_default_value_fields=False, + use_integers_for_enums=False, + ) + ) + query_params.update(self._get_unset_required_fields(query_params)) + + # Send the request + headers = dict(metadata) + headers["Content-Type"] = "application/json" + response = getattr(self._session, method)( + "{host}{uri}".format(host=self._host, uri=uri), + timeout=timeout, + headers=headers, + params=rest_helpers.flatten_query_params(query_params, strict=True), + ) + + # In case of error, raise the appropriate core_exceptions.GoogleAPICallError exception + # subclass. + if response.status_code >= 400: + raise core_exceptions.from_http_response(response) + + # Return the response + resp = user_feedback.UserFeedback() + pb_resp = user_feedback.UserFeedback.pb(resp) + + json_format.Parse(response.content, pb_resp, ignore_unknown_fields=True) + resp = self._interceptor.post_get_user_feedback(resp) + return resp + + class _UpdateUserFeedback(QuestionServiceRestStub): + def __hash__(self): + return hash("UpdateUserFeedback") + + __REQUIRED_FIELDS_DEFAULT_VALUES: Dict[str, str] = {} + + @classmethod + def _get_unset_required_fields(cls, message_dict): + return { + k: v + for k, v in cls.__REQUIRED_FIELDS_DEFAULT_VALUES.items() + if k not in message_dict + } + + def __call__( + self, + request: question_service.UpdateUserFeedbackRequest, + *, + retry: OptionalRetry = gapic_v1.method.DEFAULT, + timeout: float = None, + metadata: Sequence[Tuple[str, str]] = (), + ) -> gcd_user_feedback.UserFeedback: + r"""Call the update user feedback method over HTTP. + + Args: + request (~.question_service.UpdateUserFeedbackRequest): + The request object. Request to updates user feedback. + retry (google.api_core.retry.Retry): Designation of what errors, if any, + should be retried. + timeout (float): The timeout for this request. + metadata (Sequence[Tuple[str, str]]): Strings which should be + sent along with the request as metadata. + + Returns: + ~.gcd_user_feedback.UserFeedback: + Feedback provided by a user. + """ + + http_options: List[Dict[str, str]] = [ + { + "method": "patch", + "uri": "/v1alpha/{user_feedback.name=projects/*/locations/*/questions/*/userFeedback}", + "body": "user_feedback", + }, + ] + request, metadata = self._interceptor.pre_update_user_feedback( + request, metadata + ) + pb_request = question_service.UpdateUserFeedbackRequest.pb(request) + transcoded_request = path_template.transcode(http_options, pb_request) + + # Jsonify the request body + + body = json_format.MessageToJson( + transcoded_request["body"], + including_default_value_fields=False, + use_integers_for_enums=False, + ) + uri = transcoded_request["uri"] + method = transcoded_request["method"] + + # Jsonify the query params + query_params = json.loads( + json_format.MessageToJson( + transcoded_request["query_params"], + including_default_value_fields=False, + use_integers_for_enums=False, + ) + ) + query_params.update(self._get_unset_required_fields(query_params)) + + # Send the request + headers = dict(metadata) + headers["Content-Type"] = "application/json" + response = getattr(self._session, method)( + "{host}{uri}".format(host=self._host, uri=uri), + timeout=timeout, + headers=headers, + params=rest_helpers.flatten_query_params(query_params, strict=True), + data=body, + ) + + # In case of error, raise the appropriate core_exceptions.GoogleAPICallError exception + # subclass. + if response.status_code >= 400: + raise core_exceptions.from_http_response(response) + + # Return the response + resp = gcd_user_feedback.UserFeedback() + pb_resp = gcd_user_feedback.UserFeedback.pb(resp) + + json_format.Parse(response.content, pb_resp, ignore_unknown_fields=True) + resp = self._interceptor.post_update_user_feedback(resp) + return resp + + @property + def create_question( + self, + ) -> Callable[[question_service.CreateQuestionRequest], gcd_question.Question]: + # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. + # In C++ this would require a dynamic_cast + return self._CreateQuestion(self._session, self._host, self._interceptor) # type: ignore + + @property + def execute_question( + self, + ) -> Callable[[question_service.ExecuteQuestionRequest], question.Question]: + # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. + # In C++ this would require a dynamic_cast + return self._ExecuteQuestion(self._session, self._host, self._interceptor) # type: ignore + + @property + def get_question( + self, + ) -> Callable[[question_service.GetQuestionRequest], question.Question]: + # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. + # In C++ this would require a dynamic_cast + return self._GetQuestion(self._session, self._host, self._interceptor) # type: ignore + + @property + def get_user_feedback( + self, + ) -> Callable[ + [question_service.GetUserFeedbackRequest], user_feedback.UserFeedback + ]: + # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. + # In C++ this would require a dynamic_cast + return self._GetUserFeedback(self._session, self._host, self._interceptor) # type: ignore + + @property + def update_user_feedback( + self, + ) -> Callable[ + [question_service.UpdateUserFeedbackRequest], gcd_user_feedback.UserFeedback + ]: + # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. + # In C++ this would require a dynamic_cast + return self._UpdateUserFeedback(self._session, self._host, self._interceptor) # type: ignore + + @property + def kind(self) -> str: + return "rest" + + def close(self): + self._session.close() + + +__all__ = ("QuestionServiceRestTransport",) diff --git a/samples/generated_samples/dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync.py b/samples/generated_samples/dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync_d283907c.py similarity index 97% rename from samples/generated_samples/dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync.py rename to samples/generated_samples/dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync_d283907c.py index 33ac38e..b94990b 100644 --- a/samples/generated_samples/dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync.py +++ b/samples/generated_samples/dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync_d283907c.py @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-dataqna -# [START dataqna_v1alpha_generated_AutoSuggestionService_SuggestQueries_sync] +# [START dataqna_v1alpha_generated_AutoSuggestionService_SuggestQueries_sync_d283907c] # This snippet has been automatically generated and should be regarded as a # code template only. # It will require modifications to work: @@ -49,4 +49,4 @@ def sample_suggest_queries(): # Handle the response print(response) -# [END dataqna_v1alpha_generated_AutoSuggestionService_SuggestQueries_sync] +# [END dataqna_v1alpha_generated_AutoSuggestionService_SuggestQueries_sync_d283907c] diff --git a/samples/generated_samples/dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync_f773b5fc.py b/samples/generated_samples/dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync_f773b5fc.py new file mode 100644 index 0000000..867a9b5 --- /dev/null +++ b/samples/generated_samples/dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync_f773b5fc.py @@ -0,0 +1,52 @@ +# -*- coding: utf-8 -*- +# Copyright 2022 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 +# +# http://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. +# +# Generated code. DO NOT EDIT! +# +# Snippet for SuggestQueries +# NOTE: This snippet has been automatically generated for illustrative purposes only. +# It may require modifications to work in your environment. + +# To install the latest published package dependency, execute the following: +# python3 -m pip install google-cloud-dataqna + + +# [START dataqna_v1alpha_generated_AutoSuggestionService_SuggestQueries_sync_f773b5fc] +# This snippet has been automatically generated and should be regarded as a +# code template only. +# It will require modifications to work: +# - It may require correct/in-range values for request initialization. +# - It may require specifying regional endpoints when creating the service +# client as shown in: +# https://googleapis.dev/python/google-api-core/latest/client_options.html +from google.cloud import dataqna_v1alpha + + +def sample_suggest_queries(): + # Create a client + client = dataqna_v1alpha.AutoSuggestionServiceClient() + + # Initialize request argument(s) + request = dataqna_v1alpha.SuggestQueriesRequest( + parent="parent_value", + ) + + # Make the request + response = client.suggest_queries(request=request) + + # Handle the response + print(response) + +# [END dataqna_v1alpha_generated_AutoSuggestionService_SuggestQueries_sync_f773b5fc] diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_create_question_sync.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_create_question_sync_dc8a80fc.py similarity index 98% rename from samples/generated_samples/dataqna_v1alpha_generated_question_service_create_question_sync.py rename to samples/generated_samples/dataqna_v1alpha_generated_question_service_create_question_sync_dc8a80fc.py index fdf3b21..da1eb0d 100644 --- a/samples/generated_samples/dataqna_v1alpha_generated_question_service_create_question_sync.py +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_create_question_sync_dc8a80fc.py @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-dataqna -# [START dataqna_v1alpha_generated_QuestionService_CreateQuestion_sync] +# [START dataqna_v1alpha_generated_QuestionService_CreateQuestion_sync_dc8a80fc] # This snippet has been automatically generated and should be regarded as a # code template only. # It will require modifications to work: @@ -54,4 +54,4 @@ def sample_create_question(): # Handle the response print(response) -# [END dataqna_v1alpha_generated_QuestionService_CreateQuestion_sync] +# [END dataqna_v1alpha_generated_QuestionService_CreateQuestion_sync_dc8a80fc] diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_create_question_sync_ddc01494.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_create_question_sync_ddc01494.py new file mode 100644 index 0000000..ef9e974 --- /dev/null +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_create_question_sync_ddc01494.py @@ -0,0 +1,57 @@ +# -*- coding: utf-8 -*- +# Copyright 2022 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 +# +# http://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. +# +# Generated code. DO NOT EDIT! +# +# Snippet for CreateQuestion +# NOTE: This snippet has been automatically generated for illustrative purposes only. +# It may require modifications to work in your environment. + +# To install the latest published package dependency, execute the following: +# python3 -m pip install google-cloud-dataqna + + +# [START dataqna_v1alpha_generated_QuestionService_CreateQuestion_sync_ddc01494] +# This snippet has been automatically generated and should be regarded as a +# code template only. +# It will require modifications to work: +# - It may require correct/in-range values for request initialization. +# - It may require specifying regional endpoints when creating the service +# client as shown in: +# https://googleapis.dev/python/google-api-core/latest/client_options.html +from google.cloud import dataqna_v1alpha + + +def sample_create_question(): + # Create a client + client = dataqna_v1alpha.QuestionServiceClient() + + # Initialize request argument(s) + question = dataqna_v1alpha.Question() + question.scopes = ['scopes_value1', 'scopes_value2'] + question.query = "query_value" + + request = dataqna_v1alpha.CreateQuestionRequest( + parent="parent_value", + question=question, + ) + + # Make the request + response = client.create_question(request=request) + + # Handle the response + print(response) + +# [END dataqna_v1alpha_generated_QuestionService_CreateQuestion_sync_ddc01494] diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_execute_question_sync.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_execute_question_sync_65ec7ecd.py similarity index 98% rename from samples/generated_samples/dataqna_v1alpha_generated_question_service_execute_question_sync.py rename to samples/generated_samples/dataqna_v1alpha_generated_question_service_execute_question_sync_65ec7ecd.py index fcff838..012f7d5 100644 --- a/samples/generated_samples/dataqna_v1alpha_generated_question_service_execute_question_sync.py +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_execute_question_sync_65ec7ecd.py @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-dataqna -# [START dataqna_v1alpha_generated_QuestionService_ExecuteQuestion_sync] +# [START dataqna_v1alpha_generated_QuestionService_ExecuteQuestion_sync_65ec7ecd] # This snippet has been automatically generated and should be regarded as a # code template only. # It will require modifications to work: @@ -50,4 +50,4 @@ def sample_execute_question(): # Handle the response print(response) -# [END dataqna_v1alpha_generated_QuestionService_ExecuteQuestion_sync] +# [END dataqna_v1alpha_generated_QuestionService_ExecuteQuestion_sync_65ec7ecd] diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_execute_question_sync_af447ce0.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_execute_question_sync_af447ce0.py new file mode 100644 index 0000000..64585a0 --- /dev/null +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_execute_question_sync_af447ce0.py @@ -0,0 +1,53 @@ +# -*- coding: utf-8 -*- +# Copyright 2022 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 +# +# http://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. +# +# Generated code. DO NOT EDIT! +# +# Snippet for ExecuteQuestion +# NOTE: This snippet has been automatically generated for illustrative purposes only. +# It may require modifications to work in your environment. + +# To install the latest published package dependency, execute the following: +# python3 -m pip install google-cloud-dataqna + + +# [START dataqna_v1alpha_generated_QuestionService_ExecuteQuestion_sync_af447ce0] +# This snippet has been automatically generated and should be regarded as a +# code template only. +# It will require modifications to work: +# - It may require correct/in-range values for request initialization. +# - It may require specifying regional endpoints when creating the service +# client as shown in: +# https://googleapis.dev/python/google-api-core/latest/client_options.html +from google.cloud import dataqna_v1alpha + + +def sample_execute_question(): + # Create a client + client = dataqna_v1alpha.QuestionServiceClient() + + # Initialize request argument(s) + request = dataqna_v1alpha.ExecuteQuestionRequest( + name="name_value", + interpretation_index=2159, + ) + + # Make the request + response = client.execute_question(request=request) + + # Handle the response + print(response) + +# [END dataqna_v1alpha_generated_QuestionService_ExecuteQuestion_sync_af447ce0] diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_question_sync.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_question_sync_42230e84.py similarity index 98% rename from samples/generated_samples/dataqna_v1alpha_generated_question_service_get_question_sync.py rename to samples/generated_samples/dataqna_v1alpha_generated_question_service_get_question_sync_42230e84.py index 3603021..71e66db 100644 --- a/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_question_sync.py +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_question_sync_42230e84.py @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-dataqna -# [START dataqna_v1alpha_generated_QuestionService_GetQuestion_sync] +# [START dataqna_v1alpha_generated_QuestionService_GetQuestion_sync_42230e84] # This snippet has been automatically generated and should be regarded as a # code template only. # It will require modifications to work: @@ -49,4 +49,4 @@ def sample_get_question(): # Handle the response print(response) -# [END dataqna_v1alpha_generated_QuestionService_GetQuestion_sync] +# [END dataqna_v1alpha_generated_QuestionService_GetQuestion_sync_42230e84] diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_question_sync_46d5ce19.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_question_sync_46d5ce19.py new file mode 100644 index 0000000..990e2a1 --- /dev/null +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_question_sync_46d5ce19.py @@ -0,0 +1,52 @@ +# -*- coding: utf-8 -*- +# Copyright 2022 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 +# +# http://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. +# +# Generated code. DO NOT EDIT! +# +# Snippet for GetQuestion +# NOTE: This snippet has been automatically generated for illustrative purposes only. +# It may require modifications to work in your environment. + +# To install the latest published package dependency, execute the following: +# python3 -m pip install google-cloud-dataqna + + +# [START dataqna_v1alpha_generated_QuestionService_GetQuestion_sync_46d5ce19] +# This snippet has been automatically generated and should be regarded as a +# code template only. +# It will require modifications to work: +# - It may require correct/in-range values for request initialization. +# - It may require specifying regional endpoints when creating the service +# client as shown in: +# https://googleapis.dev/python/google-api-core/latest/client_options.html +from google.cloud import dataqna_v1alpha + + +def sample_get_question(): + # Create a client + client = dataqna_v1alpha.QuestionServiceClient() + + # Initialize request argument(s) + request = dataqna_v1alpha.GetQuestionRequest( + name="name_value", + ) + + # Make the request + response = client.get_question(request=request) + + # Handle the response + print(response) + +# [END dataqna_v1alpha_generated_QuestionService_GetQuestion_sync_46d5ce19] diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_user_feedback_sync.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_user_feedback_sync_57510043.py similarity index 98% rename from samples/generated_samples/dataqna_v1alpha_generated_question_service_get_user_feedback_sync.py rename to samples/generated_samples/dataqna_v1alpha_generated_question_service_get_user_feedback_sync_57510043.py index df04fd3..2e5eea1 100644 --- a/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_user_feedback_sync.py +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_user_feedback_sync_57510043.py @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-dataqna -# [START dataqna_v1alpha_generated_QuestionService_GetUserFeedback_sync] +# [START dataqna_v1alpha_generated_QuestionService_GetUserFeedback_sync_57510043] # This snippet has been automatically generated and should be regarded as a # code template only. # It will require modifications to work: @@ -49,4 +49,4 @@ def sample_get_user_feedback(): # Handle the response print(response) -# [END dataqna_v1alpha_generated_QuestionService_GetUserFeedback_sync] +# [END dataqna_v1alpha_generated_QuestionService_GetUserFeedback_sync_57510043] diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_user_feedback_sync_7b0c3817.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_user_feedback_sync_7b0c3817.py new file mode 100644 index 0000000..73124e6 --- /dev/null +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_get_user_feedback_sync_7b0c3817.py @@ -0,0 +1,52 @@ +# -*- coding: utf-8 -*- +# Copyright 2022 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 +# +# http://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. +# +# Generated code. DO NOT EDIT! +# +# Snippet for GetUserFeedback +# NOTE: This snippet has been automatically generated for illustrative purposes only. +# It may require modifications to work in your environment. + +# To install the latest published package dependency, execute the following: +# python3 -m pip install google-cloud-dataqna + + +# [START dataqna_v1alpha_generated_QuestionService_GetUserFeedback_sync_7b0c3817] +# This snippet has been automatically generated and should be regarded as a +# code template only. +# It will require modifications to work: +# - It may require correct/in-range values for request initialization. +# - It may require specifying regional endpoints when creating the service +# client as shown in: +# https://googleapis.dev/python/google-api-core/latest/client_options.html +from google.cloud import dataqna_v1alpha + + +def sample_get_user_feedback(): + # Create a client + client = dataqna_v1alpha.QuestionServiceClient() + + # Initialize request argument(s) + request = dataqna_v1alpha.GetUserFeedbackRequest( + name="name_value", + ) + + # Make the request + response = client.get_user_feedback(request=request) + + # Handle the response + print(response) + +# [END dataqna_v1alpha_generated_QuestionService_GetUserFeedback_sync_7b0c3817] diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_update_user_feedback_sync.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_update_user_feedback_sync_66ce529c.py similarity index 98% rename from samples/generated_samples/dataqna_v1alpha_generated_question_service_update_user_feedback_sync.py rename to samples/generated_samples/dataqna_v1alpha_generated_question_service_update_user_feedback_sync_66ce529c.py index 5860acd..47e5acd 100644 --- a/samples/generated_samples/dataqna_v1alpha_generated_question_service_update_user_feedback_sync.py +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_update_user_feedback_sync_66ce529c.py @@ -23,7 +23,7 @@ # python3 -m pip install google-cloud-dataqna -# [START dataqna_v1alpha_generated_QuestionService_UpdateUserFeedback_sync] +# [START dataqna_v1alpha_generated_QuestionService_UpdateUserFeedback_sync_66ce529c] # This snippet has been automatically generated and should be regarded as a # code template only. # It will require modifications to work: @@ -52,4 +52,4 @@ def sample_update_user_feedback(): # Handle the response print(response) -# [END dataqna_v1alpha_generated_QuestionService_UpdateUserFeedback_sync] +# [END dataqna_v1alpha_generated_QuestionService_UpdateUserFeedback_sync_66ce529c] diff --git a/samples/generated_samples/dataqna_v1alpha_generated_question_service_update_user_feedback_sync_a626ced5.py b/samples/generated_samples/dataqna_v1alpha_generated_question_service_update_user_feedback_sync_a626ced5.py new file mode 100644 index 0000000..ba80d54 --- /dev/null +++ b/samples/generated_samples/dataqna_v1alpha_generated_question_service_update_user_feedback_sync_a626ced5.py @@ -0,0 +1,55 @@ +# -*- coding: utf-8 -*- +# Copyright 2022 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 +# +# http://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. +# +# Generated code. DO NOT EDIT! +# +# Snippet for UpdateUserFeedback +# NOTE: This snippet has been automatically generated for illustrative purposes only. +# It may require modifications to work in your environment. + +# To install the latest published package dependency, execute the following: +# python3 -m pip install google-cloud-dataqna + + +# [START dataqna_v1alpha_generated_QuestionService_UpdateUserFeedback_sync_a626ced5] +# This snippet has been automatically generated and should be regarded as a +# code template only. +# It will require modifications to work: +# - It may require correct/in-range values for request initialization. +# - It may require specifying regional endpoints when creating the service +# client as shown in: +# https://googleapis.dev/python/google-api-core/latest/client_options.html +from google.cloud import dataqna_v1alpha + + +def sample_update_user_feedback(): + # Create a client + client = dataqna_v1alpha.QuestionServiceClient() + + # Initialize request argument(s) + user_feedback = dataqna_v1alpha.UserFeedback() + user_feedback.name = "name_value" + + request = dataqna_v1alpha.UpdateUserFeedbackRequest( + user_feedback=user_feedback, + ) + + # Make the request + response = client.update_user_feedback(request=request) + + # Handle the response + print(response) + +# [END dataqna_v1alpha_generated_QuestionService_UpdateUserFeedback_sync_a626ced5] diff --git a/samples/generated_samples/snippet_metadata_dataqna_v1alpha.json b/samples/generated_samples/snippet_metadata_dataqna_v1alpha.json index 3d4b8e3..37755e5 100644 --- a/samples/generated_samples/snippet_metadata_dataqna_v1alpha.json +++ b/samples/generated_samples/snippet_metadata_dataqna_v1alpha.json @@ -125,7 +125,7 @@ "shortName": "suggest_queries" }, "description": "Sample for SuggestQueries", - "file": "dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync.py", + "file": "dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync_f773b5fc.py", "language": "PYTHON", "origin": "API_DEFINITION", "regionTag": "dataqna_v1alpha_generated_AutoSuggestionService_SuggestQueries_sync", @@ -161,7 +161,83 @@ "type": "RESPONSE_HANDLING" } ], - "title": "dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync.py" + "title": "dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync_f773b5fc.py" + }, + { + "canonical": true, + "clientMethod": { + "client": { + "fullName": "google.cloud.dataqna_v1alpha.AutoSuggestionServiceClient", + "shortName": "AutoSuggestionServiceClient" + }, + "fullName": "google.cloud.dataqna_v1alpha.AutoSuggestionServiceClient.suggest_queries", + "method": { + "fullName": "google.cloud.dataqna.v1alpha.AutoSuggestionService.SuggestQueries", + "service": { + "fullName": "google.cloud.dataqna.v1alpha.AutoSuggestionService", + "shortName": "AutoSuggestionService" + }, + "shortName": "SuggestQueries" + }, + "parameters": [ + { + "name": "request", + "type": "google.cloud.dataqna_v1alpha.types.SuggestQueriesRequest" + }, + { + "name": "retry", + "type": "google.api_core.retry.Retry" + }, + { + "name": "timeout", + "type": "float" + }, + { + "name": "metadata", + "type": "Sequence[Tuple[str, str]" + } + ], + "resultType": "google.cloud.dataqna_v1alpha.types.SuggestQueriesResponse", + "shortName": "suggest_queries" + }, + "description": "Sample for SuggestQueries", + "file": "dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync_d283907c.py", + "language": "PYTHON", + "origin": "API_DEFINITION", + "regionTag": "dataqna_v1alpha_generated_AutoSuggestionService_SuggestQueries_sync", + "segments": [ + { + "end": 51, + "start": 27, + "type": "FULL" + }, + { + "end": 51, + "start": 27, + "type": "SHORT" + }, + { + "end": 40, + "start": 38, + "type": "CLIENT_INITIALIZATION" + }, + { + "end": 45, + "start": 41, + "type": "REQUEST_INITIALIZATION" + }, + { + "end": 48, + "start": 46, + "type": "REQUEST_EXECUTION" + }, + { + "end": 52, + "start": 49, + "type": "RESPONSE_HANDLING" + } + ], + "title": "dataqna_v1alpha_generated_auto_suggestion_service_suggest_queries_sync_d283907c.py" }, { "canonical": true, @@ -294,7 +370,91 @@ "shortName": "create_question" }, "description": "Sample for CreateQuestion", - "file": "dataqna_v1alpha_generated_question_service_create_question_sync.py", + "file": "dataqna_v1alpha_generated_question_service_create_question_sync_dc8a80fc.py", + "language": "PYTHON", + "origin": "API_DEFINITION", + "regionTag": "dataqna_v1alpha_generated_QuestionService_CreateQuestion_sync", + "segments": [ + { + "end": 56, + "start": 27, + "type": "FULL" + }, + { + "end": 56, + "start": 27, + "type": "SHORT" + }, + { + "end": 40, + "start": 38, + "type": "CLIENT_INITIALIZATION" + }, + { + "end": 50, + "start": 41, + "type": "REQUEST_INITIALIZATION" + }, + { + "end": 53, + "start": 51, + "type": "REQUEST_EXECUTION" + }, + { + "end": 57, + "start": 54, + "type": "RESPONSE_HANDLING" + } + ], + "title": "dataqna_v1alpha_generated_question_service_create_question_sync_dc8a80fc.py" + }, + { + "canonical": true, + "clientMethod": { + "client": { + "fullName": "google.cloud.dataqna_v1alpha.QuestionServiceClient", + "shortName": "QuestionServiceClient" + }, + "fullName": "google.cloud.dataqna_v1alpha.QuestionServiceClient.create_question", + "method": { + "fullName": "google.cloud.dataqna.v1alpha.QuestionService.CreateQuestion", + "service": { + "fullName": "google.cloud.dataqna.v1alpha.QuestionService", + "shortName": "QuestionService" + }, + "shortName": "CreateQuestion" + }, + "parameters": [ + { + "name": "request", + "type": "google.cloud.dataqna_v1alpha.types.CreateQuestionRequest" + }, + { + "name": "parent", + "type": "str" + }, + { + "name": "question", + "type": "google.cloud.dataqna_v1alpha.types.Question" + }, + { + "name": "retry", + "type": "google.api_core.retry.Retry" + }, + { + "name": "timeout", + "type": "float" + }, + { + "name": "metadata", + "type": "Sequence[Tuple[str, str]" + } + ], + "resultType": "google.cloud.dataqna_v1alpha.types.Question", + "shortName": "create_question" + }, + "description": "Sample for CreateQuestion", + "file": "dataqna_v1alpha_generated_question_service_create_question_sync_ddc01494.py", "language": "PYTHON", "origin": "API_DEFINITION", "regionTag": "dataqna_v1alpha_generated_QuestionService_CreateQuestion_sync", @@ -330,7 +490,7 @@ "type": "RESPONSE_HANDLING" } ], - "title": "dataqna_v1alpha_generated_question_service_create_question_sync.py" + "title": "dataqna_v1alpha_generated_question_service_create_question_sync_ddc01494.py" }, { "canonical": true, @@ -463,7 +623,91 @@ "shortName": "execute_question" }, "description": "Sample for ExecuteQuestion", - "file": "dataqna_v1alpha_generated_question_service_execute_question_sync.py", + "file": "dataqna_v1alpha_generated_question_service_execute_question_sync_65ec7ecd.py", + "language": "PYTHON", + "origin": "API_DEFINITION", + "regionTag": "dataqna_v1alpha_generated_QuestionService_ExecuteQuestion_sync", + "segments": [ + { + "end": 52, + "start": 27, + "type": "FULL" + }, + { + "end": 52, + "start": 27, + "type": "SHORT" + }, + { + "end": 40, + "start": 38, + "type": "CLIENT_INITIALIZATION" + }, + { + "end": 46, + "start": 41, + "type": "REQUEST_INITIALIZATION" + }, + { + "end": 49, + "start": 47, + "type": "REQUEST_EXECUTION" + }, + { + "end": 53, + "start": 50, + "type": "RESPONSE_HANDLING" + } + ], + "title": "dataqna_v1alpha_generated_question_service_execute_question_sync_65ec7ecd.py" + }, + { + "canonical": true, + "clientMethod": { + "client": { + "fullName": "google.cloud.dataqna_v1alpha.QuestionServiceClient", + "shortName": "QuestionServiceClient" + }, + "fullName": "google.cloud.dataqna_v1alpha.QuestionServiceClient.execute_question", + "method": { + "fullName": "google.cloud.dataqna.v1alpha.QuestionService.ExecuteQuestion", + "service": { + "fullName": "google.cloud.dataqna.v1alpha.QuestionService", + "shortName": "QuestionService" + }, + "shortName": "ExecuteQuestion" + }, + "parameters": [ + { + "name": "request", + "type": "google.cloud.dataqna_v1alpha.types.ExecuteQuestionRequest" + }, + { + "name": "name", + "type": "str" + }, + { + "name": "interpretation_index", + "type": "int" + }, + { + "name": "retry", + "type": "google.api_core.retry.Retry" + }, + { + "name": "timeout", + "type": "float" + }, + { + "name": "metadata", + "type": "Sequence[Tuple[str, str]" + } + ], + "resultType": "google.cloud.dataqna_v1alpha.types.Question", + "shortName": "execute_question" + }, + "description": "Sample for ExecuteQuestion", + "file": "dataqna_v1alpha_generated_question_service_execute_question_sync_af447ce0.py", "language": "PYTHON", "origin": "API_DEFINITION", "regionTag": "dataqna_v1alpha_generated_QuestionService_ExecuteQuestion_sync", @@ -499,7 +743,7 @@ "type": "RESPONSE_HANDLING" } ], - "title": "dataqna_v1alpha_generated_question_service_execute_question_sync.py" + "title": "dataqna_v1alpha_generated_question_service_execute_question_sync_af447ce0.py" }, { "canonical": true, @@ -624,7 +868,7 @@ "shortName": "get_question" }, "description": "Sample for GetQuestion", - "file": "dataqna_v1alpha_generated_question_service_get_question_sync.py", + "file": "dataqna_v1alpha_generated_question_service_get_question_sync_46d5ce19.py", "language": "PYTHON", "origin": "API_DEFINITION", "regionTag": "dataqna_v1alpha_generated_QuestionService_GetQuestion_sync", @@ -660,7 +904,87 @@ "type": "RESPONSE_HANDLING" } ], - "title": "dataqna_v1alpha_generated_question_service_get_question_sync.py" + "title": "dataqna_v1alpha_generated_question_service_get_question_sync_46d5ce19.py" + }, + { + "canonical": true, + "clientMethod": { + "client": { + "fullName": "google.cloud.dataqna_v1alpha.QuestionServiceClient", + "shortName": "QuestionServiceClient" + }, + "fullName": "google.cloud.dataqna_v1alpha.QuestionServiceClient.get_question", + "method": { + "fullName": "google.cloud.dataqna.v1alpha.QuestionService.GetQuestion", + "service": { + "fullName": "google.cloud.dataqna.v1alpha.QuestionService", + "shortName": "QuestionService" + }, + "shortName": "GetQuestion" + }, + "parameters": [ + { + "name": "request", + "type": "google.cloud.dataqna_v1alpha.types.GetQuestionRequest" + }, + { + "name": "name", + "type": "str" + }, + { + "name": "retry", + "type": "google.api_core.retry.Retry" + }, + { + "name": "timeout", + "type": "float" + }, + { + "name": "metadata", + "type": "Sequence[Tuple[str, str]" + } + ], + "resultType": "google.cloud.dataqna_v1alpha.types.Question", + "shortName": "get_question" + }, + "description": "Sample for GetQuestion", + "file": "dataqna_v1alpha_generated_question_service_get_question_sync_42230e84.py", + "language": "PYTHON", + "origin": "API_DEFINITION", + "regionTag": "dataqna_v1alpha_generated_QuestionService_GetQuestion_sync", + "segments": [ + { + "end": 51, + "start": 27, + "type": "FULL" + }, + { + "end": 51, + "start": 27, + "type": "SHORT" + }, + { + "end": 40, + "start": 38, + "type": "CLIENT_INITIALIZATION" + }, + { + "end": 45, + "start": 41, + "type": "REQUEST_INITIALIZATION" + }, + { + "end": 48, + "start": 46, + "type": "REQUEST_EXECUTION" + }, + { + "end": 52, + "start": 49, + "type": "RESPONSE_HANDLING" + } + ], + "title": "dataqna_v1alpha_generated_question_service_get_question_sync_42230e84.py" }, { "canonical": true, @@ -785,7 +1109,87 @@ "shortName": "get_user_feedback" }, "description": "Sample for GetUserFeedback", - "file": "dataqna_v1alpha_generated_question_service_get_user_feedback_sync.py", + "file": "dataqna_v1alpha_generated_question_service_get_user_feedback_sync_57510043.py", + "language": "PYTHON", + "origin": "API_DEFINITION", + "regionTag": "dataqna_v1alpha_generated_QuestionService_GetUserFeedback_sync", + "segments": [ + { + "end": 51, + "start": 27, + "type": "FULL" + }, + { + "end": 51, + "start": 27, + "type": "SHORT" + }, + { + "end": 40, + "start": 38, + "type": "CLIENT_INITIALIZATION" + }, + { + "end": 45, + "start": 41, + "type": "REQUEST_INITIALIZATION" + }, + { + "end": 48, + "start": 46, + "type": "REQUEST_EXECUTION" + }, + { + "end": 52, + "start": 49, + "type": "RESPONSE_HANDLING" + } + ], + "title": "dataqna_v1alpha_generated_question_service_get_user_feedback_sync_57510043.py" + }, + { + "canonical": true, + "clientMethod": { + "client": { + "fullName": "google.cloud.dataqna_v1alpha.QuestionServiceClient", + "shortName": "QuestionServiceClient" + }, + "fullName": "google.cloud.dataqna_v1alpha.QuestionServiceClient.get_user_feedback", + "method": { + "fullName": "google.cloud.dataqna.v1alpha.QuestionService.GetUserFeedback", + "service": { + "fullName": "google.cloud.dataqna.v1alpha.QuestionService", + "shortName": "QuestionService" + }, + "shortName": "GetUserFeedback" + }, + "parameters": [ + { + "name": "request", + "type": "google.cloud.dataqna_v1alpha.types.GetUserFeedbackRequest" + }, + { + "name": "name", + "type": "str" + }, + { + "name": "retry", + "type": "google.api_core.retry.Retry" + }, + { + "name": "timeout", + "type": "float" + }, + { + "name": "metadata", + "type": "Sequence[Tuple[str, str]" + } + ], + "resultType": "google.cloud.dataqna_v1alpha.types.UserFeedback", + "shortName": "get_user_feedback" + }, + "description": "Sample for GetUserFeedback", + "file": "dataqna_v1alpha_generated_question_service_get_user_feedback_sync_7b0c3817.py", "language": "PYTHON", "origin": "API_DEFINITION", "regionTag": "dataqna_v1alpha_generated_QuestionService_GetUserFeedback_sync", @@ -821,7 +1225,7 @@ "type": "RESPONSE_HANDLING" } ], - "title": "dataqna_v1alpha_generated_question_service_get_user_feedback_sync.py" + "title": "dataqna_v1alpha_generated_question_service_get_user_feedback_sync_7b0c3817.py" }, { "canonical": true, @@ -954,7 +1358,91 @@ "shortName": "update_user_feedback" }, "description": "Sample for UpdateUserFeedback", - "file": "dataqna_v1alpha_generated_question_service_update_user_feedback_sync.py", + "file": "dataqna_v1alpha_generated_question_service_update_user_feedback_sync_66ce529c.py", + "language": "PYTHON", + "origin": "API_DEFINITION", + "regionTag": "dataqna_v1alpha_generated_QuestionService_UpdateUserFeedback_sync", + "segments": [ + { + "end": 54, + "start": 27, + "type": "FULL" + }, + { + "end": 54, + "start": 27, + "type": "SHORT" + }, + { + "end": 40, + "start": 38, + "type": "CLIENT_INITIALIZATION" + }, + { + "end": 48, + "start": 41, + "type": "REQUEST_INITIALIZATION" + }, + { + "end": 51, + "start": 49, + "type": "REQUEST_EXECUTION" + }, + { + "end": 55, + "start": 52, + "type": "RESPONSE_HANDLING" + } + ], + "title": "dataqna_v1alpha_generated_question_service_update_user_feedback_sync_66ce529c.py" + }, + { + "canonical": true, + "clientMethod": { + "client": { + "fullName": "google.cloud.dataqna_v1alpha.QuestionServiceClient", + "shortName": "QuestionServiceClient" + }, + "fullName": "google.cloud.dataqna_v1alpha.QuestionServiceClient.update_user_feedback", + "method": { + "fullName": "google.cloud.dataqna.v1alpha.QuestionService.UpdateUserFeedback", + "service": { + "fullName": "google.cloud.dataqna.v1alpha.QuestionService", + "shortName": "QuestionService" + }, + "shortName": "UpdateUserFeedback" + }, + "parameters": [ + { + "name": "request", + "type": "google.cloud.dataqna_v1alpha.types.UpdateUserFeedbackRequest" + }, + { + "name": "user_feedback", + "type": "google.cloud.dataqna_v1alpha.types.UserFeedback" + }, + { + "name": "update_mask", + "type": "google.protobuf.field_mask_pb2.FieldMask" + }, + { + "name": "retry", + "type": "google.api_core.retry.Retry" + }, + { + "name": "timeout", + "type": "float" + }, + { + "name": "metadata", + "type": "Sequence[Tuple[str, str]" + } + ], + "resultType": "google.cloud.dataqna_v1alpha.types.UserFeedback", + "shortName": "update_user_feedback" + }, + "description": "Sample for UpdateUserFeedback", + "file": "dataqna_v1alpha_generated_question_service_update_user_feedback_sync_a626ced5.py", "language": "PYTHON", "origin": "API_DEFINITION", "regionTag": "dataqna_v1alpha_generated_QuestionService_UpdateUserFeedback_sync", @@ -990,7 +1478,7 @@ "type": "RESPONSE_HANDLING" } ], - "title": "dataqna_v1alpha_generated_question_service_update_user_feedback_sync.py" + "title": "dataqna_v1alpha_generated_question_service_update_user_feedback_sync_a626ced5.py" } ] } diff --git a/setup.py b/setup.py index c4aa560..fe7d9ce 100644 --- a/setup.py +++ b/setup.py @@ -46,9 +46,9 @@ platforms="Posix; MacOS X; Windows", include_package_data=True, install_requires=( - "google-api-core[grpc] >= 1.32.0, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*", + "google-api-core[grpc] >= 1.33.1, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*", "proto-plus >= 1.22.0, <2.0.0dev", - "protobuf >= 3.19.0, <5.0.0dev", + "protobuf >= 3.20.1, <5.0.0dev", ), python_requires=">=3.7", classifiers=[ diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt index 51901fb..dfb70ba 100644 --- a/testing/constraints-3.7.txt +++ b/testing/constraints-3.7.txt @@ -5,6 +5,6 @@ # # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", # Then this file should have foo==1.14.0 -google-api-core==1.32.0 +google-api-core==1.33.1 proto-plus==1.22.0 -protobuf==3.19.0 +protobuf==3.20.1 diff --git a/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py b/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py index 3768889..6f9fca0 100644 --- a/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py +++ b/tests/unit/gapic/dataqna_v1alpha/test_auto_suggestion_service.py @@ -22,6 +22,8 @@ except ImportError: # pragma: NO COVER import mock +from collections.abc import Iterable +import json import math from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template @@ -31,11 +33,14 @@ from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError from google.oauth2 import service_account +from google.protobuf import json_format import grpc from grpc.experimental import aio from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule import pytest +from requests import PreparedRequest, Request, Response +from requests.sessions import Session from google.cloud.dataqna_v1alpha.services.auto_suggestion_service import ( AutoSuggestionServiceAsyncClient, @@ -95,6 +100,7 @@ def test__get_default_mtls_endpoint(): [ (AutoSuggestionServiceClient, "grpc"), (AutoSuggestionServiceAsyncClient, "grpc_asyncio"), + (AutoSuggestionServiceClient, "rest"), ], ) def test_auto_suggestion_service_client_from_service_account_info( @@ -110,7 +116,11 @@ def test_auto_suggestion_service_client_from_service_account_info( assert client.transport._credentials == creds assert isinstance(client, client_class) - assert client.transport._host == ("dataqna.googleapis.com:443") + assert client.transport._host == ( + "dataqna.googleapis.com:443" + if transport_name in ["grpc", "grpc_asyncio"] + else "https://dataqna.googleapis.com" + ) @pytest.mark.parametrize( @@ -118,6 +128,7 @@ def test_auto_suggestion_service_client_from_service_account_info( [ (transports.AutoSuggestionServiceGrpcTransport, "grpc"), (transports.AutoSuggestionServiceGrpcAsyncIOTransport, "grpc_asyncio"), + (transports.AutoSuggestionServiceRestTransport, "rest"), ], ) def test_auto_suggestion_service_client_service_account_always_use_jwt( @@ -143,6 +154,7 @@ def test_auto_suggestion_service_client_service_account_always_use_jwt( [ (AutoSuggestionServiceClient, "grpc"), (AutoSuggestionServiceAsyncClient, "grpc_asyncio"), + (AutoSuggestionServiceClient, "rest"), ], ) def test_auto_suggestion_service_client_from_service_account_file( @@ -165,13 +177,18 @@ def test_auto_suggestion_service_client_from_service_account_file( assert client.transport._credentials == creds assert isinstance(client, client_class) - assert client.transport._host == ("dataqna.googleapis.com:443") + assert client.transport._host == ( + "dataqna.googleapis.com:443" + if transport_name in ["grpc", "grpc_asyncio"] + else "https://dataqna.googleapis.com" + ) def test_auto_suggestion_service_client_get_transport_class(): transport = AutoSuggestionServiceClient.get_transport_class() available_transports = [ transports.AutoSuggestionServiceGrpcTransport, + transports.AutoSuggestionServiceRestTransport, ] assert transport in available_transports @@ -192,6 +209,11 @@ def test_auto_suggestion_service_client_get_transport_class(): transports.AutoSuggestionServiceGrpcAsyncIOTransport, "grpc_asyncio", ), + ( + AutoSuggestionServiceClient, + transports.AutoSuggestionServiceRestTransport, + "rest", + ), ], ) @mock.patch.object( @@ -347,6 +369,18 @@ def test_auto_suggestion_service_client_client_options( "grpc_asyncio", "false", ), + ( + AutoSuggestionServiceClient, + transports.AutoSuggestionServiceRestTransport, + "rest", + "true", + ), + ( + AutoSuggestionServiceClient, + transports.AutoSuggestionServiceRestTransport, + "rest", + "false", + ), ], ) @mock.patch.object( @@ -550,6 +584,11 @@ def test_auto_suggestion_service_client_get_mtls_endpoint_and_cert_source(client transports.AutoSuggestionServiceGrpcAsyncIOTransport, "grpc_asyncio", ), + ( + AutoSuggestionServiceClient, + transports.AutoSuggestionServiceRestTransport, + "rest", + ), ], ) def test_auto_suggestion_service_client_client_options_scopes( @@ -590,6 +629,12 @@ def test_auto_suggestion_service_client_client_options_scopes( "grpc_asyncio", grpc_helpers_async, ), + ( + AutoSuggestionServiceClient, + transports.AutoSuggestionServiceRestTransport, + "rest", + None, + ), ], ) def test_auto_suggestion_service_client_client_options_credentials_file( @@ -847,6 +892,222 @@ async def test_suggest_queries_field_headers_async(): ) in kw["metadata"] +@pytest.mark.parametrize( + "request_type", + [ + auto_suggestion_service.SuggestQueriesRequest, + dict, + ], +) +def test_suggest_queries_rest(request_type): + client = AutoSuggestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + + # send a request that will satisfy transcoding + request_init = {"parent": "projects/sample1/locations/sample2"} + request = request_type(**request_init) + + # Mock the http request call within the method and fake a response. + with mock.patch.object(type(client.transport._session), "request") as req: + # Designate an appropriate value for the returned response. + return_value = auto_suggestion_service.SuggestQueriesResponse() + + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 200 + pb_return_value = auto_suggestion_service.SuggestQueriesResponse.pb( + return_value + ) + json_return_value = json_format.MessageToJson(pb_return_value) + + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + response = client.suggest_queries(request) + + # Establish that the response is the type that we expect. + assert isinstance(response, auto_suggestion_service.SuggestQueriesResponse) + + +def test_suggest_queries_rest_required_fields( + request_type=auto_suggestion_service.SuggestQueriesRequest, +): + transport_class = transports.AutoSuggestionServiceRestTransport + + request_init = {} + request_init["parent"] = "" + request = request_type(**request_init) + pb_request = request_type.pb(request) + jsonified_request = json.loads( + json_format.MessageToJson( + pb_request, + including_default_value_fields=False, + use_integers_for_enums=False, + ) + ) + + # verify fields with default values are dropped + + unset_fields = transport_class( + credentials=ga_credentials.AnonymousCredentials() + ).suggest_queries._get_unset_required_fields(jsonified_request) + jsonified_request.update(unset_fields) + + # verify required fields with default values are now present + + jsonified_request["parent"] = "parent_value" + + unset_fields = transport_class( + credentials=ga_credentials.AnonymousCredentials() + ).suggest_queries._get_unset_required_fields(jsonified_request) + jsonified_request.update(unset_fields) + + # verify required fields with non-default values are left alone + assert "parent" in jsonified_request + assert jsonified_request["parent"] == "parent_value" + + client = AutoSuggestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + request = request_type(**request_init) + + # Designate an appropriate value for the returned response. + return_value = auto_suggestion_service.SuggestQueriesResponse() + # Mock the http request call within the method and fake a response. + with mock.patch.object(Session, "request") as req: + # We need to mock transcode() because providing default values + # for required fields will fail the real version if the http_options + # expect actual values for those fields. + with mock.patch.object(path_template, "transcode") as transcode: + # A uri without fields and an empty body will force all the + # request fields to show up in the query_params. + pb_request = request_type.pb(request) + transcode_result = { + "uri": "v1/sample_method", + "method": "post", + "query_params": pb_request, + } + transcode_result["body"] = pb_request + transcode.return_value = transcode_result + + response_value = Response() + response_value.status_code = 200 + + pb_return_value = auto_suggestion_service.SuggestQueriesResponse.pb( + return_value + ) + json_return_value = json_format.MessageToJson(pb_return_value) + + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + + response = client.suggest_queries(request) + + expected_params = [] + actual_params = req.call_args.kwargs["params"] + assert expected_params == actual_params + + +def test_suggest_queries_rest_unset_required_fields(): + transport = transports.AutoSuggestionServiceRestTransport( + credentials=ga_credentials.AnonymousCredentials + ) + + unset_fields = transport.suggest_queries._get_unset_required_fields({}) + assert set(unset_fields) == (set(()) & set(("parent",))) + + +@pytest.mark.parametrize("null_interceptor", [True, False]) +def test_suggest_queries_rest_interceptors(null_interceptor): + transport = transports.AutoSuggestionServiceRestTransport( + credentials=ga_credentials.AnonymousCredentials(), + interceptor=None + if null_interceptor + else transports.AutoSuggestionServiceRestInterceptor(), + ) + client = AutoSuggestionServiceClient(transport=transport) + with mock.patch.object( + type(client.transport._session), "request" + ) as req, mock.patch.object( + path_template, "transcode" + ) as transcode, mock.patch.object( + transports.AutoSuggestionServiceRestInterceptor, "post_suggest_queries" + ) as post, mock.patch.object( + transports.AutoSuggestionServiceRestInterceptor, "pre_suggest_queries" + ) as pre: + pre.assert_not_called() + post.assert_not_called() + pb_message = auto_suggestion_service.SuggestQueriesRequest.pb( + auto_suggestion_service.SuggestQueriesRequest() + ) + transcode.return_value = { + "method": "post", + "uri": "my_uri", + "body": pb_message, + "query_params": pb_message, + } + + req.return_value = Response() + req.return_value.status_code = 200 + req.return_value.request = PreparedRequest() + req.return_value._content = ( + auto_suggestion_service.SuggestQueriesResponse.to_json( + auto_suggestion_service.SuggestQueriesResponse() + ) + ) + + request = auto_suggestion_service.SuggestQueriesRequest() + metadata = [ + ("key", "val"), + ("cephalopod", "squid"), + ] + pre.return_value = request, metadata + post.return_value = auto_suggestion_service.SuggestQueriesResponse() + + client.suggest_queries( + request, + metadata=[ + ("key", "val"), + ("cephalopod", "squid"), + ], + ) + + pre.assert_called_once() + post.assert_called_once() + + +def test_suggest_queries_rest_bad_request( + transport: str = "rest", request_type=auto_suggestion_service.SuggestQueriesRequest +): + client = AutoSuggestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, + ) + + # send a request that will satisfy transcoding + request_init = {"parent": "projects/sample1/locations/sample2"} + request = request_type(**request_init) + + # Mock the http request call within the method and fake a BadRequest error. + with mock.patch.object(Session, "request") as req, pytest.raises( + core_exceptions.BadRequest + ): + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 400 + response_value.request = Request() + req.return_value = response_value + client.suggest_queries(request) + + +def test_suggest_queries_rest_error(): + client = AutoSuggestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), transport="rest" + ) + + def test_credentials_transport_error(): # It is an error to provide credentials and a transport instance. transport = transports.AutoSuggestionServiceGrpcTransport( @@ -928,6 +1189,7 @@ def test_transport_get_channel(): [ transports.AutoSuggestionServiceGrpcTransport, transports.AutoSuggestionServiceGrpcAsyncIOTransport, + transports.AutoSuggestionServiceRestTransport, ], ) def test_transport_adc(transport_class): @@ -942,6 +1204,7 @@ def test_transport_adc(transport_class): "transport_name", [ "grpc", + "rest", ], ) def test_transport_kind(transport_name): @@ -1069,6 +1332,7 @@ def test_auto_suggestion_service_transport_auth_adc(transport_class): [ transports.AutoSuggestionServiceGrpcTransport, transports.AutoSuggestionServiceGrpcAsyncIOTransport, + transports.AutoSuggestionServiceRestTransport, ], ) def test_auto_suggestion_service_transport_auth_gdch_credentials(transport_class): @@ -1170,11 +1434,23 @@ def test_auto_suggestion_service_grpc_transport_client_cert_source_for_mtls( ) +def test_auto_suggestion_service_http_transport_client_cert_source_for_mtls(): + cred = ga_credentials.AnonymousCredentials() + with mock.patch( + "google.auth.transport.requests.AuthorizedSession.configure_mtls_channel" + ) as mock_configure_mtls_channel: + transports.AutoSuggestionServiceRestTransport( + credentials=cred, client_cert_source_for_mtls=client_cert_source_callback + ) + mock_configure_mtls_channel.assert_called_once_with(client_cert_source_callback) + + @pytest.mark.parametrize( "transport_name", [ "grpc", "grpc_asyncio", + "rest", ], ) def test_auto_suggestion_service_host_no_port(transport_name): @@ -1185,7 +1461,11 @@ def test_auto_suggestion_service_host_no_port(transport_name): ), transport=transport_name, ) - assert client.transport._host == ("dataqna.googleapis.com:443") + assert client.transport._host == ( + "dataqna.googleapis.com:443" + if transport_name in ["grpc", "grpc_asyncio"] + else "https://dataqna.googleapis.com" + ) @pytest.mark.parametrize( @@ -1193,6 +1473,7 @@ def test_auto_suggestion_service_host_no_port(transport_name): [ "grpc", "grpc_asyncio", + "rest", ], ) def test_auto_suggestion_service_host_with_port(transport_name): @@ -1203,7 +1484,33 @@ def test_auto_suggestion_service_host_with_port(transport_name): ), transport=transport_name, ) - assert client.transport._host == ("dataqna.googleapis.com:8000") + assert client.transport._host == ( + "dataqna.googleapis.com:8000" + if transport_name in ["grpc", "grpc_asyncio"] + else "https://dataqna.googleapis.com:8000" + ) + + +@pytest.mark.parametrize( + "transport_name", + [ + "rest", + ], +) +def test_auto_suggestion_service_client_transport_session_collision(transport_name): + creds1 = ga_credentials.AnonymousCredentials() + creds2 = ga_credentials.AnonymousCredentials() + client1 = AutoSuggestionServiceClient( + credentials=creds1, + transport=transport_name, + ) + client2 = AutoSuggestionServiceClient( + credentials=creds2, + transport=transport_name, + ) + session1 = client1.transport.suggest_queries._session + session2 = client2.transport.suggest_queries._session + assert session1 != session2 def test_auto_suggestion_service_grpc_transport_channel(): @@ -1474,6 +1781,7 @@ async def test_transport_close_async(): def test_transport_close(): transports = { + "rest": "_session", "grpc": "_grpc_channel", } @@ -1491,6 +1799,7 @@ def test_transport_close(): def test_client_ctx(): transports = [ + "rest", "grpc", ] for transport in transports: diff --git a/tests/unit/gapic/dataqna_v1alpha/test_question_service.py b/tests/unit/gapic/dataqna_v1alpha/test_question_service.py index 5755e22..db6e41d 100644 --- a/tests/unit/gapic/dataqna_v1alpha/test_question_service.py +++ b/tests/unit/gapic/dataqna_v1alpha/test_question_service.py @@ -22,6 +22,8 @@ except ImportError: # pragma: NO COVER import mock +from collections.abc import Iterable +import json import math from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template @@ -33,6 +35,7 @@ from google.oauth2 import service_account from google.protobuf import any_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import json_format from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore import grpc @@ -40,6 +43,8 @@ from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule import pytest +from requests import PreparedRequest, Request, Response +from requests.sessions import Session from google.cloud.dataqna_v1alpha.services.question_service import ( QuestionServiceAsyncClient, @@ -103,6 +108,7 @@ def test__get_default_mtls_endpoint(): [ (QuestionServiceClient, "grpc"), (QuestionServiceAsyncClient, "grpc_asyncio"), + (QuestionServiceClient, "rest"), ], ) def test_question_service_client_from_service_account_info( @@ -118,7 +124,11 @@ def test_question_service_client_from_service_account_info( assert client.transport._credentials == creds assert isinstance(client, client_class) - assert client.transport._host == ("dataqna.googleapis.com:443") + assert client.transport._host == ( + "dataqna.googleapis.com:443" + if transport_name in ["grpc", "grpc_asyncio"] + else "https://dataqna.googleapis.com" + ) @pytest.mark.parametrize( @@ -126,6 +136,7 @@ def test_question_service_client_from_service_account_info( [ (transports.QuestionServiceGrpcTransport, "grpc"), (transports.QuestionServiceGrpcAsyncIOTransport, "grpc_asyncio"), + (transports.QuestionServiceRestTransport, "rest"), ], ) def test_question_service_client_service_account_always_use_jwt( @@ -151,6 +162,7 @@ def test_question_service_client_service_account_always_use_jwt( [ (QuestionServiceClient, "grpc"), (QuestionServiceAsyncClient, "grpc_asyncio"), + (QuestionServiceClient, "rest"), ], ) def test_question_service_client_from_service_account_file( @@ -173,13 +185,18 @@ def test_question_service_client_from_service_account_file( assert client.transport._credentials == creds assert isinstance(client, client_class) - assert client.transport._host == ("dataqna.googleapis.com:443") + assert client.transport._host == ( + "dataqna.googleapis.com:443" + if transport_name in ["grpc", "grpc_asyncio"] + else "https://dataqna.googleapis.com" + ) def test_question_service_client_get_transport_class(): transport = QuestionServiceClient.get_transport_class() available_transports = [ transports.QuestionServiceGrpcTransport, + transports.QuestionServiceRestTransport, ] assert transport in available_transports @@ -196,6 +213,7 @@ def test_question_service_client_get_transport_class(): transports.QuestionServiceGrpcAsyncIOTransport, "grpc_asyncio", ), + (QuestionServiceClient, transports.QuestionServiceRestTransport, "rest"), ], ) @mock.patch.object( @@ -351,6 +369,18 @@ def test_question_service_client_client_options( "grpc_asyncio", "false", ), + ( + QuestionServiceClient, + transports.QuestionServiceRestTransport, + "rest", + "true", + ), + ( + QuestionServiceClient, + transports.QuestionServiceRestTransport, + "rest", + "false", + ), ], ) @mock.patch.object( @@ -550,6 +580,7 @@ def test_question_service_client_get_mtls_endpoint_and_cert_source(client_class) transports.QuestionServiceGrpcAsyncIOTransport, "grpc_asyncio", ), + (QuestionServiceClient, transports.QuestionServiceRestTransport, "rest"), ], ) def test_question_service_client_client_options_scopes( @@ -590,6 +621,7 @@ def test_question_service_client_client_options_scopes( "grpc_asyncio", grpc_helpers_async, ), + (QuestionServiceClient, transports.QuestionServiceRestTransport, "rest", None), ], ) def test_question_service_client_client_options_credentials_file( @@ -1979,172 +2011,1770 @@ async def test_update_user_feedback_flattened_error_async(): ) -def test_credentials_transport_error(): - # It is an error to provide credentials and a transport instance. - transport = transports.QuestionServiceGrpcTransport( +@pytest.mark.parametrize( + "request_type", + [ + question_service.GetQuestionRequest, + dict, + ], +) +def test_get_question_rest(request_type): + client = QuestionServiceClient( credentials=ga_credentials.AnonymousCredentials(), + transport="rest", ) - with pytest.raises(ValueError): - client = QuestionServiceClient( - credentials=ga_credentials.AnonymousCredentials(), - transport=transport, + + # send a request that will satisfy transcoding + request_init = {"name": "projects/sample1/locations/sample2/questions/sample3"} + request = request_type(**request_init) + + # Mock the http request call within the method and fake a response. + with mock.patch.object(type(client.transport._session), "request") as req: + # Designate an appropriate value for the returned response. + return_value = question.Question( + name="name_value", + scopes=["scopes_value"], + query="query_value", + data_source_annotations=["data_source_annotations_value"], + user_email="user_email_value", ) - # It is an error to provide a credentials file and a transport instance. - transport = transports.QuestionServiceGrpcTransport( - credentials=ga_credentials.AnonymousCredentials(), - ) - with pytest.raises(ValueError): - client = QuestionServiceClient( - client_options={"credentials_file": "credentials.json"}, - transport=transport, + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 200 + pb_return_value = question.Question.pb(return_value) + json_return_value = json_format.MessageToJson(pb_return_value) + + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + response = client.get_question(request) + + # Establish that the response is the type that we expect. + assert isinstance(response, question.Question) + assert response.name == "name_value" + assert response.scopes == ["scopes_value"] + assert response.query == "query_value" + assert response.data_source_annotations == ["data_source_annotations_value"] + assert response.user_email == "user_email_value" + + +def test_get_question_rest_required_fields( + request_type=question_service.GetQuestionRequest, +): + transport_class = transports.QuestionServiceRestTransport + + request_init = {} + request_init["name"] = "" + request = request_type(**request_init) + pb_request = request_type.pb(request) + jsonified_request = json.loads( + json_format.MessageToJson( + pb_request, + including_default_value_fields=False, + use_integers_for_enums=False, ) + ) - # It is an error to provide an api_key and a transport instance. - transport = transports.QuestionServiceGrpcTransport( + # verify fields with default values are dropped + + unset_fields = transport_class( + credentials=ga_credentials.AnonymousCredentials() + ).get_question._get_unset_required_fields(jsonified_request) + jsonified_request.update(unset_fields) + + # verify required fields with default values are now present + + jsonified_request["name"] = "name_value" + + unset_fields = transport_class( + credentials=ga_credentials.AnonymousCredentials() + ).get_question._get_unset_required_fields(jsonified_request) + # Check that path parameters and body parameters are not mixing in. + assert not set(unset_fields) - set(("read_mask",)) + jsonified_request.update(unset_fields) + + # verify required fields with non-default values are left alone + assert "name" in jsonified_request + assert jsonified_request["name"] == "name_value" + + client = QuestionServiceClient( credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + request = request_type(**request_init) + + # Designate an appropriate value for the returned response. + return_value = question.Question() + # Mock the http request call within the method and fake a response. + with mock.patch.object(Session, "request") as req: + # We need to mock transcode() because providing default values + # for required fields will fail the real version if the http_options + # expect actual values for those fields. + with mock.patch.object(path_template, "transcode") as transcode: + # A uri without fields and an empty body will force all the + # request fields to show up in the query_params. + pb_request = request_type.pb(request) + transcode_result = { + "uri": "v1/sample_method", + "method": "get", + "query_params": pb_request, + } + transcode.return_value = transcode_result + + response_value = Response() + response_value.status_code = 200 + + pb_return_value = question.Question.pb(return_value) + json_return_value = json_format.MessageToJson(pb_return_value) + + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + + response = client.get_question(request) + + expected_params = [] + actual_params = req.call_args.kwargs["params"] + assert expected_params == actual_params + + +def test_get_question_rest_unset_required_fields(): + transport = transports.QuestionServiceRestTransport( + credentials=ga_credentials.AnonymousCredentials ) - options = client_options.ClientOptions() - options.api_key = "api_key" - with pytest.raises(ValueError): - client = QuestionServiceClient( - client_options=options, - transport=transport, - ) - # It is an error to provide an api_key and a credential. - options = mock.Mock() - options.api_key = "api_key" - with pytest.raises(ValueError): - client = QuestionServiceClient( - client_options=options, credentials=ga_credentials.AnonymousCredentials() - ) + unset_fields = transport.get_question._get_unset_required_fields({}) + assert set(unset_fields) == (set(("readMask",)) & set(("name",))) - # It is an error to provide scopes and a transport instance. - transport = transports.QuestionServiceGrpcTransport( + +@pytest.mark.parametrize("null_interceptor", [True, False]) +def test_get_question_rest_interceptors(null_interceptor): + transport = transports.QuestionServiceRestTransport( credentials=ga_credentials.AnonymousCredentials(), + interceptor=None + if null_interceptor + else transports.QuestionServiceRestInterceptor(), ) - with pytest.raises(ValueError): - client = QuestionServiceClient( - client_options={"scopes": ["1", "2"]}, - transport=transport, + client = QuestionServiceClient(transport=transport) + with mock.patch.object( + type(client.transport._session), "request" + ) as req, mock.patch.object( + path_template, "transcode" + ) as transcode, mock.patch.object( + transports.QuestionServiceRestInterceptor, "post_get_question" + ) as post, mock.patch.object( + transports.QuestionServiceRestInterceptor, "pre_get_question" + ) as pre: + pre.assert_not_called() + post.assert_not_called() + pb_message = question_service.GetQuestionRequest.pb( + question_service.GetQuestionRequest() + ) + transcode.return_value = { + "method": "post", + "uri": "my_uri", + "body": pb_message, + "query_params": pb_message, + } + + req.return_value = Response() + req.return_value.status_code = 200 + req.return_value.request = PreparedRequest() + req.return_value._content = question.Question.to_json(question.Question()) + + request = question_service.GetQuestionRequest() + metadata = [ + ("key", "val"), + ("cephalopod", "squid"), + ] + pre.return_value = request, metadata + post.return_value = question.Question() + + client.get_question( + request, + metadata=[ + ("key", "val"), + ("cephalopod", "squid"), + ], ) + pre.assert_called_once() + post.assert_called_once() -def test_transport_instance(): - # A client may be instantiated with a custom transport instance. - transport = transports.QuestionServiceGrpcTransport( + +def test_get_question_rest_bad_request( + transport: str = "rest", request_type=question_service.GetQuestionRequest +): + client = QuestionServiceClient( credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) - client = QuestionServiceClient(transport=transport) - assert client.transport is transport + # send a request that will satisfy transcoding + request_init = {"name": "projects/sample1/locations/sample2/questions/sample3"} + request = request_type(**request_init) -def test_transport_get_channel(): - # A client may be instantiated with a custom transport instance. - transport = transports.QuestionServiceGrpcTransport( + # Mock the http request call within the method and fake a BadRequest error. + with mock.patch.object(Session, "request") as req, pytest.raises( + core_exceptions.BadRequest + ): + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 400 + response_value.request = Request() + req.return_value = response_value + client.get_question(request) + + +def test_get_question_rest_flattened(): + client = QuestionServiceClient( credentials=ga_credentials.AnonymousCredentials(), + transport="rest", ) - channel = transport.grpc_channel - assert channel - transport = transports.QuestionServiceGrpcAsyncIOTransport( + # Mock the http request call within the method and fake a response. + with mock.patch.object(type(client.transport._session), "request") as req: + # Designate an appropriate value for the returned response. + return_value = question.Question() + + # get arguments that satisfy an http rule for this method + sample_request = { + "name": "projects/sample1/locations/sample2/questions/sample3" + } + + # get truthy value for each flattened field + mock_args = dict( + name="name_value", + ) + mock_args.update(sample_request) + + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 200 + pb_return_value = question.Question.pb(return_value) + json_return_value = json_format.MessageToJson(pb_return_value) + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + + client.get_question(**mock_args) + + # Establish that the underlying call was made with the expected + # request object values. + assert len(req.mock_calls) == 1 + _, args, _ = req.mock_calls[0] + assert path_template.validate( + "%s/v1alpha/{name=projects/*/locations/*/questions/*}" + % client.transport._host, + args[1], + ) + + +def test_get_question_rest_flattened_error(transport: str = "rest"): + client = QuestionServiceClient( credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) - channel = transport.grpc_channel - assert channel + + # Attempting to call a method with both a request object and flattened + # fields is an error. + with pytest.raises(ValueError): + client.get_question( + question_service.GetQuestionRequest(), + name="name_value", + ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.QuestionServiceGrpcTransport, - transports.QuestionServiceGrpcAsyncIOTransport, - ], -) -def test_transport_adc(transport_class): - # Test default credentials are used if not provided. - with mock.patch.object(google.auth, "default") as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - transport_class() - adc.assert_called_once() +def test_get_question_rest_error(): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), transport="rest" + ) @pytest.mark.parametrize( - "transport_name", + "request_type", [ - "grpc", + question_service.CreateQuestionRequest, + dict, ], ) -def test_transport_kind(transport_name): - transport = QuestionServiceClient.get_transport_class(transport_name)( +def test_create_question_rest(request_type): + client = QuestionServiceClient( credentials=ga_credentials.AnonymousCredentials(), + transport="rest", ) - assert transport.kind == transport_name + # send a request that will satisfy transcoding + request_init = {"parent": "projects/sample1/locations/sample2"} + request_init["question"] = { + "name": "name_value", + "scopes": ["scopes_value1", "scopes_value2"], + "query": "query_value", + "data_source_annotations": [ + "data_source_annotations_value1", + "data_source_annotations_value2", + ], + "interpret_error": { + "message": "message_value", + "code": 1, + "details": { + "unsupported_details": { + "operators": ["operators_value1", "operators_value2"], + "intent": ["intent_value1", "intent_value2"], + }, + "incomplete_query_details": {"entities": [1]}, + "ambiguity_details": {}, + }, + }, + "interpretations": [ + { + "data_sources": ["data_sources_value1", "data_sources_value2"], + "confidence": 0.1038, + "unused_phrases": ["unused_phrases_value1", "unused_phrases_value2"], + "human_readable": { + "generated_interpretation": { + "text_formatted": "text_formatted_value", + "html_formatted": "html_formatted_value", + "markups": [ + {"type_": 1, "start_char_index": 1698, "length": 642} + ], + }, + "original_question": {}, + }, + "interpretation_structure": { + "visualization_types": [1], + "column_info": [ + { + "output_alias": "output_alias_value", + "display_name": "display_name_value", + } + ], + }, + "data_query": {"sql": "sql_value"}, + "execution_info": { + "job_creation_status": { + "code": 411, + "message": "message_value", + "details": [ + { + "type_url": "type.googleapis.com/google.protobuf.Duration", + "value": b"\x08\x0c\x10\xdb\x07", + } + ], + }, + "job_execution_state": 1, + "create_time": {"seconds": 751, "nanos": 543}, + "bigquery_job": { + "job_id": "job_id_value", + "project_id": "project_id_value", + "location": "location_value", + }, + }, + } + ], + "create_time": {}, + "user_email": "user_email_value", + "debug_flags": { + "include_va_query": True, + "include_nested_va_query": True, + "include_human_interpretation": True, + "include_aqua_debug_response": True, + "time_override": 1390, + "is_internal_google_user": True, + "ignore_cache": True, + "include_search_entities_rpc": True, + "include_list_column_annotations_rpc": True, + "include_virtual_analyst_entities": True, + "include_table_list": True, + "include_domain_list": True, + }, + "debug_info": {}, + } + request = request_type(**request_init) + + # Mock the http request call within the method and fake a response. + with mock.patch.object(type(client.transport._session), "request") as req: + # Designate an appropriate value for the returned response. + return_value = gcd_question.Question( + name="name_value", + scopes=["scopes_value"], + query="query_value", + data_source_annotations=["data_source_annotations_value"], + user_email="user_email_value", + ) + + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 200 + pb_return_value = gcd_question.Question.pb(return_value) + json_return_value = json_format.MessageToJson(pb_return_value) + + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + response = client.create_question(request) + + # Establish that the response is the type that we expect. + assert isinstance(response, gcd_question.Question) + assert response.name == "name_value" + assert response.scopes == ["scopes_value"] + assert response.query == "query_value" + assert response.data_source_annotations == ["data_source_annotations_value"] + assert response.user_email == "user_email_value" + + +def test_create_question_rest_required_fields( + request_type=question_service.CreateQuestionRequest, +): + transport_class = transports.QuestionServiceRestTransport + + request_init = {} + request_init["parent"] = "" + request = request_type(**request_init) + pb_request = request_type.pb(request) + jsonified_request = json.loads( + json_format.MessageToJson( + pb_request, + including_default_value_fields=False, + use_integers_for_enums=False, + ) + ) + + # verify fields with default values are dropped + + unset_fields = transport_class( + credentials=ga_credentials.AnonymousCredentials() + ).create_question._get_unset_required_fields(jsonified_request) + jsonified_request.update(unset_fields) + + # verify required fields with default values are now present + + jsonified_request["parent"] = "parent_value" + + unset_fields = transport_class( + credentials=ga_credentials.AnonymousCredentials() + ).create_question._get_unset_required_fields(jsonified_request) + jsonified_request.update(unset_fields) + + # verify required fields with non-default values are left alone + assert "parent" in jsonified_request + assert jsonified_request["parent"] == "parent_value" -def test_transport_grpc_default(): - # A client should use the gRPC transport by default. client = QuestionServiceClient( credentials=ga_credentials.AnonymousCredentials(), + transport="rest", ) - assert isinstance( - client.transport, - transports.QuestionServiceGrpcTransport, + request = request_type(**request_init) + + # Designate an appropriate value for the returned response. + return_value = gcd_question.Question() + # Mock the http request call within the method and fake a response. + with mock.patch.object(Session, "request") as req: + # We need to mock transcode() because providing default values + # for required fields will fail the real version if the http_options + # expect actual values for those fields. + with mock.patch.object(path_template, "transcode") as transcode: + # A uri without fields and an empty body will force all the + # request fields to show up in the query_params. + pb_request = request_type.pb(request) + transcode_result = { + "uri": "v1/sample_method", + "method": "post", + "query_params": pb_request, + } + transcode_result["body"] = pb_request + transcode.return_value = transcode_result + + response_value = Response() + response_value.status_code = 200 + + pb_return_value = gcd_question.Question.pb(return_value) + json_return_value = json_format.MessageToJson(pb_return_value) + + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + + response = client.create_question(request) + + expected_params = [] + actual_params = req.call_args.kwargs["params"] + assert expected_params == actual_params + + +def test_create_question_rest_unset_required_fields(): + transport = transports.QuestionServiceRestTransport( + credentials=ga_credentials.AnonymousCredentials ) + unset_fields = transport.create_question._get_unset_required_fields({}) + assert set(unset_fields) == ( + set(()) + & set( + ( + "parent", + "question", + ) + ) + ) -def test_question_service_base_transport_error(): - # Passing both a credentials object and credentials_file should raise an error - with pytest.raises(core_exceptions.DuplicateCredentialArgs): - transport = transports.QuestionServiceTransport( - credentials=ga_credentials.AnonymousCredentials(), - credentials_file="credentials.json", + +@pytest.mark.parametrize("null_interceptor", [True, False]) +def test_create_question_rest_interceptors(null_interceptor): + transport = transports.QuestionServiceRestTransport( + credentials=ga_credentials.AnonymousCredentials(), + interceptor=None + if null_interceptor + else transports.QuestionServiceRestInterceptor(), + ) + client = QuestionServiceClient(transport=transport) + with mock.patch.object( + type(client.transport._session), "request" + ) as req, mock.patch.object( + path_template, "transcode" + ) as transcode, mock.patch.object( + transports.QuestionServiceRestInterceptor, "post_create_question" + ) as post, mock.patch.object( + transports.QuestionServiceRestInterceptor, "pre_create_question" + ) as pre: + pre.assert_not_called() + post.assert_not_called() + pb_message = question_service.CreateQuestionRequest.pb( + question_service.CreateQuestionRequest() + ) + transcode.return_value = { + "method": "post", + "uri": "my_uri", + "body": pb_message, + "query_params": pb_message, + } + + req.return_value = Response() + req.return_value.status_code = 200 + req.return_value.request = PreparedRequest() + req.return_value._content = gcd_question.Question.to_json( + gcd_question.Question() ) + request = question_service.CreateQuestionRequest() + metadata = [ + ("key", "val"), + ("cephalopod", "squid"), + ] + pre.return_value = request, metadata + post.return_value = gcd_question.Question() -def test_question_service_base_transport(): - # Instantiate the base transport. - with mock.patch( - "google.cloud.dataqna_v1alpha.services.question_service.transports.QuestionServiceTransport.__init__" - ) as Transport: - Transport.return_value = None - transport = transports.QuestionServiceTransport( - credentials=ga_credentials.AnonymousCredentials(), + client.create_question( + request, + metadata=[ + ("key", "val"), + ("cephalopod", "squid"), + ], ) - # Every method on the transport should just blindly - # raise NotImplementedError. - methods = ( - "get_question", - "create_question", - "execute_question", - "get_user_feedback", - "update_user_feedback", + pre.assert_called_once() + post.assert_called_once() + + +def test_create_question_rest_bad_request( + transport: str = "rest", request_type=question_service.CreateQuestionRequest +): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) - for method in methods: - with pytest.raises(NotImplementedError): - getattr(transport, method)(request=object()) - with pytest.raises(NotImplementedError): - transport.close() + # send a request that will satisfy transcoding + request_init = {"parent": "projects/sample1/locations/sample2"} + request_init["question"] = { + "name": "name_value", + "scopes": ["scopes_value1", "scopes_value2"], + "query": "query_value", + "data_source_annotations": [ + "data_source_annotations_value1", + "data_source_annotations_value2", + ], + "interpret_error": { + "message": "message_value", + "code": 1, + "details": { + "unsupported_details": { + "operators": ["operators_value1", "operators_value2"], + "intent": ["intent_value1", "intent_value2"], + }, + "incomplete_query_details": {"entities": [1]}, + "ambiguity_details": {}, + }, + }, + "interpretations": [ + { + "data_sources": ["data_sources_value1", "data_sources_value2"], + "confidence": 0.1038, + "unused_phrases": ["unused_phrases_value1", "unused_phrases_value2"], + "human_readable": { + "generated_interpretation": { + "text_formatted": "text_formatted_value", + "html_formatted": "html_formatted_value", + "markups": [ + {"type_": 1, "start_char_index": 1698, "length": 642} + ], + }, + "original_question": {}, + }, + "interpretation_structure": { + "visualization_types": [1], + "column_info": [ + { + "output_alias": "output_alias_value", + "display_name": "display_name_value", + } + ], + }, + "data_query": {"sql": "sql_value"}, + "execution_info": { + "job_creation_status": { + "code": 411, + "message": "message_value", + "details": [ + { + "type_url": "type.googleapis.com/google.protobuf.Duration", + "value": b"\x08\x0c\x10\xdb\x07", + } + ], + }, + "job_execution_state": 1, + "create_time": {"seconds": 751, "nanos": 543}, + "bigquery_job": { + "job_id": "job_id_value", + "project_id": "project_id_value", + "location": "location_value", + }, + }, + } + ], + "create_time": {}, + "user_email": "user_email_value", + "debug_flags": { + "include_va_query": True, + "include_nested_va_query": True, + "include_human_interpretation": True, + "include_aqua_debug_response": True, + "time_override": 1390, + "is_internal_google_user": True, + "ignore_cache": True, + "include_search_entities_rpc": True, + "include_list_column_annotations_rpc": True, + "include_virtual_analyst_entities": True, + "include_table_list": True, + "include_domain_list": True, + }, + "debug_info": {}, + } + request = request_type(**request_init) - # Catch all for all remaining methods and properties - remainder = [ - "kind", - ] - for r in remainder: - with pytest.raises(NotImplementedError): - getattr(transport, r)() + # Mock the http request call within the method and fake a BadRequest error. + with mock.patch.object(Session, "request") as req, pytest.raises( + core_exceptions.BadRequest + ): + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 400 + response_value.request = Request() + req.return_value = response_value + client.create_question(request) -def test_question_service_base_transport_with_credentials_file(): - # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.dataqna_v1alpha.services.question_service.transports.QuestionServiceTransport._prep_wrapped_messages" - ) as Transport: +def test_create_question_rest_flattened(): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + + # Mock the http request call within the method and fake a response. + with mock.patch.object(type(client.transport._session), "request") as req: + # Designate an appropriate value for the returned response. + return_value = gcd_question.Question() + + # get arguments that satisfy an http rule for this method + sample_request = {"parent": "projects/sample1/locations/sample2"} + + # get truthy value for each flattened field + mock_args = dict( + parent="parent_value", + question=gcd_question.Question(name="name_value"), + ) + mock_args.update(sample_request) + + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 200 + pb_return_value = gcd_question.Question.pb(return_value) + json_return_value = json_format.MessageToJson(pb_return_value) + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + + client.create_question(**mock_args) + + # Establish that the underlying call was made with the expected + # request object values. + assert len(req.mock_calls) == 1 + _, args, _ = req.mock_calls[0] + assert path_template.validate( + "%s/v1alpha/{parent=projects/*/locations/*}/questions" + % client.transport._host, + args[1], + ) + + +def test_create_question_rest_flattened_error(transport: str = "rest"): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, + ) + + # Attempting to call a method with both a request object and flattened + # fields is an error. + with pytest.raises(ValueError): + client.create_question( + question_service.CreateQuestionRequest(), + parent="parent_value", + question=gcd_question.Question(name="name_value"), + ) + + +def test_create_question_rest_error(): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), transport="rest" + ) + + +@pytest.mark.parametrize( + "request_type", + [ + question_service.ExecuteQuestionRequest, + dict, + ], +) +def test_execute_question_rest(request_type): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + + # send a request that will satisfy transcoding + request_init = {"name": "projects/sample1/locations/sample2/questions/sample3"} + request = request_type(**request_init) + + # Mock the http request call within the method and fake a response. + with mock.patch.object(type(client.transport._session), "request") as req: + # Designate an appropriate value for the returned response. + return_value = question.Question( + name="name_value", + scopes=["scopes_value"], + query="query_value", + data_source_annotations=["data_source_annotations_value"], + user_email="user_email_value", + ) + + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 200 + pb_return_value = question.Question.pb(return_value) + json_return_value = json_format.MessageToJson(pb_return_value) + + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + response = client.execute_question(request) + + # Establish that the response is the type that we expect. + assert isinstance(response, question.Question) + assert response.name == "name_value" + assert response.scopes == ["scopes_value"] + assert response.query == "query_value" + assert response.data_source_annotations == ["data_source_annotations_value"] + assert response.user_email == "user_email_value" + + +def test_execute_question_rest_required_fields( + request_type=question_service.ExecuteQuestionRequest, +): + transport_class = transports.QuestionServiceRestTransport + + request_init = {} + request_init["name"] = "" + request_init["interpretation_index"] = 0 + request = request_type(**request_init) + pb_request = request_type.pb(request) + jsonified_request = json.loads( + json_format.MessageToJson( + pb_request, + including_default_value_fields=False, + use_integers_for_enums=False, + ) + ) + + # verify fields with default values are dropped + + unset_fields = transport_class( + credentials=ga_credentials.AnonymousCredentials() + ).execute_question._get_unset_required_fields(jsonified_request) + jsonified_request.update(unset_fields) + + # verify required fields with default values are now present + + jsonified_request["name"] = "name_value" + jsonified_request["interpretationIndex"] = 2159 + + unset_fields = transport_class( + credentials=ga_credentials.AnonymousCredentials() + ).execute_question._get_unset_required_fields(jsonified_request) + jsonified_request.update(unset_fields) + + # verify required fields with non-default values are left alone + assert "name" in jsonified_request + assert jsonified_request["name"] == "name_value" + assert "interpretationIndex" in jsonified_request + assert jsonified_request["interpretationIndex"] == 2159 + + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + request = request_type(**request_init) + + # Designate an appropriate value for the returned response. + return_value = question.Question() + # Mock the http request call within the method and fake a response. + with mock.patch.object(Session, "request") as req: + # We need to mock transcode() because providing default values + # for required fields will fail the real version if the http_options + # expect actual values for those fields. + with mock.patch.object(path_template, "transcode") as transcode: + # A uri without fields and an empty body will force all the + # request fields to show up in the query_params. + pb_request = request_type.pb(request) + transcode_result = { + "uri": "v1/sample_method", + "method": "post", + "query_params": pb_request, + } + transcode_result["body"] = pb_request + transcode.return_value = transcode_result + + response_value = Response() + response_value.status_code = 200 + + pb_return_value = question.Question.pb(return_value) + json_return_value = json_format.MessageToJson(pb_return_value) + + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + + response = client.execute_question(request) + + expected_params = [] + actual_params = req.call_args.kwargs["params"] + assert expected_params == actual_params + + +def test_execute_question_rest_unset_required_fields(): + transport = transports.QuestionServiceRestTransport( + credentials=ga_credentials.AnonymousCredentials + ) + + unset_fields = transport.execute_question._get_unset_required_fields({}) + assert set(unset_fields) == ( + set(()) + & set( + ( + "name", + "interpretationIndex", + ) + ) + ) + + +@pytest.mark.parametrize("null_interceptor", [True, False]) +def test_execute_question_rest_interceptors(null_interceptor): + transport = transports.QuestionServiceRestTransport( + credentials=ga_credentials.AnonymousCredentials(), + interceptor=None + if null_interceptor + else transports.QuestionServiceRestInterceptor(), + ) + client = QuestionServiceClient(transport=transport) + with mock.patch.object( + type(client.transport._session), "request" + ) as req, mock.patch.object( + path_template, "transcode" + ) as transcode, mock.patch.object( + transports.QuestionServiceRestInterceptor, "post_execute_question" + ) as post, mock.patch.object( + transports.QuestionServiceRestInterceptor, "pre_execute_question" + ) as pre: + pre.assert_not_called() + post.assert_not_called() + pb_message = question_service.ExecuteQuestionRequest.pb( + question_service.ExecuteQuestionRequest() + ) + transcode.return_value = { + "method": "post", + "uri": "my_uri", + "body": pb_message, + "query_params": pb_message, + } + + req.return_value = Response() + req.return_value.status_code = 200 + req.return_value.request = PreparedRequest() + req.return_value._content = question.Question.to_json(question.Question()) + + request = question_service.ExecuteQuestionRequest() + metadata = [ + ("key", "val"), + ("cephalopod", "squid"), + ] + pre.return_value = request, metadata + post.return_value = question.Question() + + client.execute_question( + request, + metadata=[ + ("key", "val"), + ("cephalopod", "squid"), + ], + ) + + pre.assert_called_once() + post.assert_called_once() + + +def test_execute_question_rest_bad_request( + transport: str = "rest", request_type=question_service.ExecuteQuestionRequest +): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, + ) + + # send a request that will satisfy transcoding + request_init = {"name": "projects/sample1/locations/sample2/questions/sample3"} + request = request_type(**request_init) + + # Mock the http request call within the method and fake a BadRequest error. + with mock.patch.object(Session, "request") as req, pytest.raises( + core_exceptions.BadRequest + ): + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 400 + response_value.request = Request() + req.return_value = response_value + client.execute_question(request) + + +def test_execute_question_rest_flattened(): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + + # Mock the http request call within the method and fake a response. + with mock.patch.object(type(client.transport._session), "request") as req: + # Designate an appropriate value for the returned response. + return_value = question.Question() + + # get arguments that satisfy an http rule for this method + sample_request = { + "name": "projects/sample1/locations/sample2/questions/sample3" + } + + # get truthy value for each flattened field + mock_args = dict( + name="name_value", + interpretation_index=2159, + ) + mock_args.update(sample_request) + + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 200 + pb_return_value = question.Question.pb(return_value) + json_return_value = json_format.MessageToJson(pb_return_value) + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + + client.execute_question(**mock_args) + + # Establish that the underlying call was made with the expected + # request object values. + assert len(req.mock_calls) == 1 + _, args, _ = req.mock_calls[0] + assert path_template.validate( + "%s/v1alpha/{name=projects/*/locations/*/questions/*}:execute" + % client.transport._host, + args[1], + ) + + +def test_execute_question_rest_flattened_error(transport: str = "rest"): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, + ) + + # Attempting to call a method with both a request object and flattened + # fields is an error. + with pytest.raises(ValueError): + client.execute_question( + question_service.ExecuteQuestionRequest(), + name="name_value", + interpretation_index=2159, + ) + + +def test_execute_question_rest_error(): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), transport="rest" + ) + + +@pytest.mark.parametrize( + "request_type", + [ + question_service.GetUserFeedbackRequest, + dict, + ], +) +def test_get_user_feedback_rest(request_type): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + + # send a request that will satisfy transcoding + request_init = { + "name": "projects/sample1/locations/sample2/questions/sample3/userFeedback" + } + request = request_type(**request_init) + + # Mock the http request call within the method and fake a response. + with mock.patch.object(type(client.transport._session), "request") as req: + # Designate an appropriate value for the returned response. + return_value = user_feedback.UserFeedback( + name="name_value", + free_form_feedback="free_form_feedback_value", + rating=user_feedback.UserFeedback.UserFeedbackRating.POSITIVE, + ) + + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 200 + pb_return_value = user_feedback.UserFeedback.pb(return_value) + json_return_value = json_format.MessageToJson(pb_return_value) + + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + response = client.get_user_feedback(request) + + # Establish that the response is the type that we expect. + assert isinstance(response, user_feedback.UserFeedback) + assert response.name == "name_value" + assert response.free_form_feedback == "free_form_feedback_value" + assert response.rating == user_feedback.UserFeedback.UserFeedbackRating.POSITIVE + + +def test_get_user_feedback_rest_required_fields( + request_type=question_service.GetUserFeedbackRequest, +): + transport_class = transports.QuestionServiceRestTransport + + request_init = {} + request_init["name"] = "" + request = request_type(**request_init) + pb_request = request_type.pb(request) + jsonified_request = json.loads( + json_format.MessageToJson( + pb_request, + including_default_value_fields=False, + use_integers_for_enums=False, + ) + ) + + # verify fields with default values are dropped + + unset_fields = transport_class( + credentials=ga_credentials.AnonymousCredentials() + ).get_user_feedback._get_unset_required_fields(jsonified_request) + jsonified_request.update(unset_fields) + + # verify required fields with default values are now present + + jsonified_request["name"] = "name_value" + + unset_fields = transport_class( + credentials=ga_credentials.AnonymousCredentials() + ).get_user_feedback._get_unset_required_fields(jsonified_request) + jsonified_request.update(unset_fields) + + # verify required fields with non-default values are left alone + assert "name" in jsonified_request + assert jsonified_request["name"] == "name_value" + + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + request = request_type(**request_init) + + # Designate an appropriate value for the returned response. + return_value = user_feedback.UserFeedback() + # Mock the http request call within the method and fake a response. + with mock.patch.object(Session, "request") as req: + # We need to mock transcode() because providing default values + # for required fields will fail the real version if the http_options + # expect actual values for those fields. + with mock.patch.object(path_template, "transcode") as transcode: + # A uri without fields and an empty body will force all the + # request fields to show up in the query_params. + pb_request = request_type.pb(request) + transcode_result = { + "uri": "v1/sample_method", + "method": "get", + "query_params": pb_request, + } + transcode.return_value = transcode_result + + response_value = Response() + response_value.status_code = 200 + + pb_return_value = user_feedback.UserFeedback.pb(return_value) + json_return_value = json_format.MessageToJson(pb_return_value) + + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + + response = client.get_user_feedback(request) + + expected_params = [] + actual_params = req.call_args.kwargs["params"] + assert expected_params == actual_params + + +def test_get_user_feedback_rest_unset_required_fields(): + transport = transports.QuestionServiceRestTransport( + credentials=ga_credentials.AnonymousCredentials + ) + + unset_fields = transport.get_user_feedback._get_unset_required_fields({}) + assert set(unset_fields) == (set(()) & set(("name",))) + + +@pytest.mark.parametrize("null_interceptor", [True, False]) +def test_get_user_feedback_rest_interceptors(null_interceptor): + transport = transports.QuestionServiceRestTransport( + credentials=ga_credentials.AnonymousCredentials(), + interceptor=None + if null_interceptor + else transports.QuestionServiceRestInterceptor(), + ) + client = QuestionServiceClient(transport=transport) + with mock.patch.object( + type(client.transport._session), "request" + ) as req, mock.patch.object( + path_template, "transcode" + ) as transcode, mock.patch.object( + transports.QuestionServiceRestInterceptor, "post_get_user_feedback" + ) as post, mock.patch.object( + transports.QuestionServiceRestInterceptor, "pre_get_user_feedback" + ) as pre: + pre.assert_not_called() + post.assert_not_called() + pb_message = question_service.GetUserFeedbackRequest.pb( + question_service.GetUserFeedbackRequest() + ) + transcode.return_value = { + "method": "post", + "uri": "my_uri", + "body": pb_message, + "query_params": pb_message, + } + + req.return_value = Response() + req.return_value.status_code = 200 + req.return_value.request = PreparedRequest() + req.return_value._content = user_feedback.UserFeedback.to_json( + user_feedback.UserFeedback() + ) + + request = question_service.GetUserFeedbackRequest() + metadata = [ + ("key", "val"), + ("cephalopod", "squid"), + ] + pre.return_value = request, metadata + post.return_value = user_feedback.UserFeedback() + + client.get_user_feedback( + request, + metadata=[ + ("key", "val"), + ("cephalopod", "squid"), + ], + ) + + pre.assert_called_once() + post.assert_called_once() + + +def test_get_user_feedback_rest_bad_request( + transport: str = "rest", request_type=question_service.GetUserFeedbackRequest +): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, + ) + + # send a request that will satisfy transcoding + request_init = { + "name": "projects/sample1/locations/sample2/questions/sample3/userFeedback" + } + request = request_type(**request_init) + + # Mock the http request call within the method and fake a BadRequest error. + with mock.patch.object(Session, "request") as req, pytest.raises( + core_exceptions.BadRequest + ): + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 400 + response_value.request = Request() + req.return_value = response_value + client.get_user_feedback(request) + + +def test_get_user_feedback_rest_flattened(): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + + # Mock the http request call within the method and fake a response. + with mock.patch.object(type(client.transport._session), "request") as req: + # Designate an appropriate value for the returned response. + return_value = user_feedback.UserFeedback() + + # get arguments that satisfy an http rule for this method + sample_request = { + "name": "projects/sample1/locations/sample2/questions/sample3/userFeedback" + } + + # get truthy value for each flattened field + mock_args = dict( + name="name_value", + ) + mock_args.update(sample_request) + + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 200 + pb_return_value = user_feedback.UserFeedback.pb(return_value) + json_return_value = json_format.MessageToJson(pb_return_value) + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + + client.get_user_feedback(**mock_args) + + # Establish that the underlying call was made with the expected + # request object values. + assert len(req.mock_calls) == 1 + _, args, _ = req.mock_calls[0] + assert path_template.validate( + "%s/v1alpha/{name=projects/*/locations/*/questions/*/userFeedback}" + % client.transport._host, + args[1], + ) + + +def test_get_user_feedback_rest_flattened_error(transport: str = "rest"): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, + ) + + # Attempting to call a method with both a request object and flattened + # fields is an error. + with pytest.raises(ValueError): + client.get_user_feedback( + question_service.GetUserFeedbackRequest(), + name="name_value", + ) + + +def test_get_user_feedback_rest_error(): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), transport="rest" + ) + + +@pytest.mark.parametrize( + "request_type", + [ + question_service.UpdateUserFeedbackRequest, + dict, + ], +) +def test_update_user_feedback_rest(request_type): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + + # send a request that will satisfy transcoding + request_init = { + "user_feedback": { + "name": "projects/sample1/locations/sample2/questions/sample3/userFeedback" + } + } + request_init["user_feedback"] = { + "name": "projects/sample1/locations/sample2/questions/sample3/userFeedback", + "free_form_feedback": "free_form_feedback_value", + "rating": 1, + } + request = request_type(**request_init) + + # Mock the http request call within the method and fake a response. + with mock.patch.object(type(client.transport._session), "request") as req: + # Designate an appropriate value for the returned response. + return_value = gcd_user_feedback.UserFeedback( + name="name_value", + free_form_feedback="free_form_feedback_value", + rating=gcd_user_feedback.UserFeedback.UserFeedbackRating.POSITIVE, + ) + + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 200 + pb_return_value = gcd_user_feedback.UserFeedback.pb(return_value) + json_return_value = json_format.MessageToJson(pb_return_value) + + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + response = client.update_user_feedback(request) + + # Establish that the response is the type that we expect. + assert isinstance(response, gcd_user_feedback.UserFeedback) + assert response.name == "name_value" + assert response.free_form_feedback == "free_form_feedback_value" + assert response.rating == gcd_user_feedback.UserFeedback.UserFeedbackRating.POSITIVE + + +def test_update_user_feedback_rest_required_fields( + request_type=question_service.UpdateUserFeedbackRequest, +): + transport_class = transports.QuestionServiceRestTransport + + request_init = {} + request = request_type(**request_init) + pb_request = request_type.pb(request) + jsonified_request = json.loads( + json_format.MessageToJson( + pb_request, + including_default_value_fields=False, + use_integers_for_enums=False, + ) + ) + + # verify fields with default values are dropped + + unset_fields = transport_class( + credentials=ga_credentials.AnonymousCredentials() + ).update_user_feedback._get_unset_required_fields(jsonified_request) + jsonified_request.update(unset_fields) + + # verify required fields with default values are now present + + unset_fields = transport_class( + credentials=ga_credentials.AnonymousCredentials() + ).update_user_feedback._get_unset_required_fields(jsonified_request) + # Check that path parameters and body parameters are not mixing in. + assert not set(unset_fields) - set(("update_mask",)) + jsonified_request.update(unset_fields) + + # verify required fields with non-default values are left alone + + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + request = request_type(**request_init) + + # Designate an appropriate value for the returned response. + return_value = gcd_user_feedback.UserFeedback() + # Mock the http request call within the method and fake a response. + with mock.patch.object(Session, "request") as req: + # We need to mock transcode() because providing default values + # for required fields will fail the real version if the http_options + # expect actual values for those fields. + with mock.patch.object(path_template, "transcode") as transcode: + # A uri without fields and an empty body will force all the + # request fields to show up in the query_params. + pb_request = request_type.pb(request) + transcode_result = { + "uri": "v1/sample_method", + "method": "patch", + "query_params": pb_request, + } + transcode_result["body"] = pb_request + transcode.return_value = transcode_result + + response_value = Response() + response_value.status_code = 200 + + pb_return_value = gcd_user_feedback.UserFeedback.pb(return_value) + json_return_value = json_format.MessageToJson(pb_return_value) + + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + + response = client.update_user_feedback(request) + + expected_params = [] + actual_params = req.call_args.kwargs["params"] + assert expected_params == actual_params + + +def test_update_user_feedback_rest_unset_required_fields(): + transport = transports.QuestionServiceRestTransport( + credentials=ga_credentials.AnonymousCredentials + ) + + unset_fields = transport.update_user_feedback._get_unset_required_fields({}) + assert set(unset_fields) == (set(("updateMask",)) & set(("userFeedback",))) + + +@pytest.mark.parametrize("null_interceptor", [True, False]) +def test_update_user_feedback_rest_interceptors(null_interceptor): + transport = transports.QuestionServiceRestTransport( + credentials=ga_credentials.AnonymousCredentials(), + interceptor=None + if null_interceptor + else transports.QuestionServiceRestInterceptor(), + ) + client = QuestionServiceClient(transport=transport) + with mock.patch.object( + type(client.transport._session), "request" + ) as req, mock.patch.object( + path_template, "transcode" + ) as transcode, mock.patch.object( + transports.QuestionServiceRestInterceptor, "post_update_user_feedback" + ) as post, mock.patch.object( + transports.QuestionServiceRestInterceptor, "pre_update_user_feedback" + ) as pre: + pre.assert_not_called() + post.assert_not_called() + pb_message = question_service.UpdateUserFeedbackRequest.pb( + question_service.UpdateUserFeedbackRequest() + ) + transcode.return_value = { + "method": "post", + "uri": "my_uri", + "body": pb_message, + "query_params": pb_message, + } + + req.return_value = Response() + req.return_value.status_code = 200 + req.return_value.request = PreparedRequest() + req.return_value._content = gcd_user_feedback.UserFeedback.to_json( + gcd_user_feedback.UserFeedback() + ) + + request = question_service.UpdateUserFeedbackRequest() + metadata = [ + ("key", "val"), + ("cephalopod", "squid"), + ] + pre.return_value = request, metadata + post.return_value = gcd_user_feedback.UserFeedback() + + client.update_user_feedback( + request, + metadata=[ + ("key", "val"), + ("cephalopod", "squid"), + ], + ) + + pre.assert_called_once() + post.assert_called_once() + + +def test_update_user_feedback_rest_bad_request( + transport: str = "rest", request_type=question_service.UpdateUserFeedbackRequest +): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, + ) + + # send a request that will satisfy transcoding + request_init = { + "user_feedback": { + "name": "projects/sample1/locations/sample2/questions/sample3/userFeedback" + } + } + request_init["user_feedback"] = { + "name": "projects/sample1/locations/sample2/questions/sample3/userFeedback", + "free_form_feedback": "free_form_feedback_value", + "rating": 1, + } + request = request_type(**request_init) + + # Mock the http request call within the method and fake a BadRequest error. + with mock.patch.object(Session, "request") as req, pytest.raises( + core_exceptions.BadRequest + ): + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 400 + response_value.request = Request() + req.return_value = response_value + client.update_user_feedback(request) + + +def test_update_user_feedback_rest_flattened(): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport="rest", + ) + + # Mock the http request call within the method and fake a response. + with mock.patch.object(type(client.transport._session), "request") as req: + # Designate an appropriate value for the returned response. + return_value = gcd_user_feedback.UserFeedback() + + # get arguments that satisfy an http rule for this method + sample_request = { + "user_feedback": { + "name": "projects/sample1/locations/sample2/questions/sample3/userFeedback" + } + } + + # get truthy value for each flattened field + mock_args = dict( + user_feedback=gcd_user_feedback.UserFeedback(name="name_value"), + update_mask=field_mask_pb2.FieldMask(paths=["paths_value"]), + ) + mock_args.update(sample_request) + + # Wrap the value into a proper Response obj + response_value = Response() + response_value.status_code = 200 + pb_return_value = gcd_user_feedback.UserFeedback.pb(return_value) + json_return_value = json_format.MessageToJson(pb_return_value) + response_value._content = json_return_value.encode("UTF-8") + req.return_value = response_value + + client.update_user_feedback(**mock_args) + + # Establish that the underlying call was made with the expected + # request object values. + assert len(req.mock_calls) == 1 + _, args, _ = req.mock_calls[0] + assert path_template.validate( + "%s/v1alpha/{user_feedback.name=projects/*/locations/*/questions/*/userFeedback}" + % client.transport._host, + args[1], + ) + + +def test_update_user_feedback_rest_flattened_error(transport: str = "rest"): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, + ) + + # Attempting to call a method with both a request object and flattened + # fields is an error. + with pytest.raises(ValueError): + client.update_user_feedback( + question_service.UpdateUserFeedbackRequest(), + user_feedback=gcd_user_feedback.UserFeedback(name="name_value"), + update_mask=field_mask_pb2.FieldMask(paths=["paths_value"]), + ) + + +def test_update_user_feedback_rest_error(): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), transport="rest" + ) + + +def test_credentials_transport_error(): + # It is an error to provide credentials and a transport instance. + transport = transports.QuestionServiceGrpcTransport( + credentials=ga_credentials.AnonymousCredentials(), + ) + with pytest.raises(ValueError): + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, + ) + + # It is an error to provide a credentials file and a transport instance. + transport = transports.QuestionServiceGrpcTransport( + credentials=ga_credentials.AnonymousCredentials(), + ) + with pytest.raises(ValueError): + client = QuestionServiceClient( + client_options={"credentials_file": "credentials.json"}, + transport=transport, + ) + + # It is an error to provide an api_key and a transport instance. + transport = transports.QuestionServiceGrpcTransport( + credentials=ga_credentials.AnonymousCredentials(), + ) + options = client_options.ClientOptions() + options.api_key = "api_key" + with pytest.raises(ValueError): + client = QuestionServiceClient( + client_options=options, + transport=transport, + ) + + # It is an error to provide an api_key and a credential. + options = mock.Mock() + options.api_key = "api_key" + with pytest.raises(ValueError): + client = QuestionServiceClient( + client_options=options, credentials=ga_credentials.AnonymousCredentials() + ) + + # It is an error to provide scopes and a transport instance. + transport = transports.QuestionServiceGrpcTransport( + credentials=ga_credentials.AnonymousCredentials(), + ) + with pytest.raises(ValueError): + client = QuestionServiceClient( + client_options={"scopes": ["1", "2"]}, + transport=transport, + ) + + +def test_transport_instance(): + # A client may be instantiated with a custom transport instance. + transport = transports.QuestionServiceGrpcTransport( + credentials=ga_credentials.AnonymousCredentials(), + ) + client = QuestionServiceClient(transport=transport) + assert client.transport is transport + + +def test_transport_get_channel(): + # A client may be instantiated with a custom transport instance. + transport = transports.QuestionServiceGrpcTransport( + credentials=ga_credentials.AnonymousCredentials(), + ) + channel = transport.grpc_channel + assert channel + + transport = transports.QuestionServiceGrpcAsyncIOTransport( + credentials=ga_credentials.AnonymousCredentials(), + ) + channel = transport.grpc_channel + assert channel + + +@pytest.mark.parametrize( + "transport_class", + [ + transports.QuestionServiceGrpcTransport, + transports.QuestionServiceGrpcAsyncIOTransport, + transports.QuestionServiceRestTransport, + ], +) +def test_transport_adc(transport_class): + # Test default credentials are used if not provided. + with mock.patch.object(google.auth, "default") as adc: + adc.return_value = (ga_credentials.AnonymousCredentials(), None) + transport_class() + adc.assert_called_once() + + +@pytest.mark.parametrize( + "transport_name", + [ + "grpc", + "rest", + ], +) +def test_transport_kind(transport_name): + transport = QuestionServiceClient.get_transport_class(transport_name)( + credentials=ga_credentials.AnonymousCredentials(), + ) + assert transport.kind == transport_name + + +def test_transport_grpc_default(): + # A client should use the gRPC transport by default. + client = QuestionServiceClient( + credentials=ga_credentials.AnonymousCredentials(), + ) + assert isinstance( + client.transport, + transports.QuestionServiceGrpcTransport, + ) + + +def test_question_service_base_transport_error(): + # Passing both a credentials object and credentials_file should raise an error + with pytest.raises(core_exceptions.DuplicateCredentialArgs): + transport = transports.QuestionServiceTransport( + credentials=ga_credentials.AnonymousCredentials(), + credentials_file="credentials.json", + ) + + +def test_question_service_base_transport(): + # Instantiate the base transport. + with mock.patch( + "google.cloud.dataqna_v1alpha.services.question_service.transports.QuestionServiceTransport.__init__" + ) as Transport: + Transport.return_value = None + transport = transports.QuestionServiceTransport( + credentials=ga_credentials.AnonymousCredentials(), + ) + + # Every method on the transport should just blindly + # raise NotImplementedError. + methods = ( + "get_question", + "create_question", + "execute_question", + "get_user_feedback", + "update_user_feedback", + ) + for method in methods: + with pytest.raises(NotImplementedError): + getattr(transport, method)(request=object()) + + with pytest.raises(NotImplementedError): + transport.close() + + # Catch all for all remaining methods and properties + remainder = [ + "kind", + ] + for r in remainder: + with pytest.raises(NotImplementedError): + getattr(transport, r)() + + +def test_question_service_base_transport_with_credentials_file(): + # Instantiate the base transport with a credentials file + with mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, mock.patch( + "google.cloud.dataqna_v1alpha.services.question_service.transports.QuestionServiceTransport._prep_wrapped_messages" + ) as Transport: Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.QuestionServiceTransport( @@ -2207,6 +3837,7 @@ def test_question_service_transport_auth_adc(transport_class): [ transports.QuestionServiceGrpcTransport, transports.QuestionServiceGrpcAsyncIOTransport, + transports.QuestionServiceRestTransport, ], ) def test_question_service_transport_auth_gdch_credentials(transport_class): @@ -2304,11 +3935,23 @@ def test_question_service_grpc_transport_client_cert_source_for_mtls(transport_c ) +def test_question_service_http_transport_client_cert_source_for_mtls(): + cred = ga_credentials.AnonymousCredentials() + with mock.patch( + "google.auth.transport.requests.AuthorizedSession.configure_mtls_channel" + ) as mock_configure_mtls_channel: + transports.QuestionServiceRestTransport( + credentials=cred, client_cert_source_for_mtls=client_cert_source_callback + ) + mock_configure_mtls_channel.assert_called_once_with(client_cert_source_callback) + + @pytest.mark.parametrize( "transport_name", [ "grpc", "grpc_asyncio", + "rest", ], ) def test_question_service_host_no_port(transport_name): @@ -2319,7 +3962,11 @@ def test_question_service_host_no_port(transport_name): ), transport=transport_name, ) - assert client.transport._host == ("dataqna.googleapis.com:443") + assert client.transport._host == ( + "dataqna.googleapis.com:443" + if transport_name in ["grpc", "grpc_asyncio"] + else "https://dataqna.googleapis.com" + ) @pytest.mark.parametrize( @@ -2327,6 +3974,7 @@ def test_question_service_host_no_port(transport_name): [ "grpc", "grpc_asyncio", + "rest", ], ) def test_question_service_host_with_port(transport_name): @@ -2337,7 +3985,45 @@ def test_question_service_host_with_port(transport_name): ), transport=transport_name, ) - assert client.transport._host == ("dataqna.googleapis.com:8000") + assert client.transport._host == ( + "dataqna.googleapis.com:8000" + if transport_name in ["grpc", "grpc_asyncio"] + else "https://dataqna.googleapis.com:8000" + ) + + +@pytest.mark.parametrize( + "transport_name", + [ + "rest", + ], +) +def test_question_service_client_transport_session_collision(transport_name): + creds1 = ga_credentials.AnonymousCredentials() + creds2 = ga_credentials.AnonymousCredentials() + client1 = QuestionServiceClient( + credentials=creds1, + transport=transport_name, + ) + client2 = QuestionServiceClient( + credentials=creds2, + transport=transport_name, + ) + session1 = client1.transport.get_question._session + session2 = client2.transport.get_question._session + assert session1 != session2 + session1 = client1.transport.create_question._session + session2 = client2.transport.create_question._session + assert session1 != session2 + session1 = client1.transport.execute_question._session + session2 = client2.transport.execute_question._session + assert session1 != session2 + session1 = client1.transport.get_user_feedback._session + session2 = client2.transport.get_user_feedback._session + assert session1 != session2 + session1 = client1.transport.update_user_feedback._session + session2 = client2.transport.update_user_feedback._session + assert session1 != session2 def test_question_service_grpc_transport_channel(): @@ -2660,6 +4346,7 @@ async def test_transport_close_async(): def test_transport_close(): transports = { + "rest": "_session", "grpc": "_grpc_channel", } @@ -2677,6 +4364,7 @@ def test_transport_close(): def test_client_ctx(): transports = [ + "rest", "grpc", ] for transport in transports: From b72469017a6ee204e162d8028aeec46f29d1c287 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 15:18:15 -0400 Subject: [PATCH 11/11] chore(main): release 0.8.0 (#183) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bd683f..d143fb0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.8.0](https://github.com/googleapis/python-data-qna/compare/v0.7.1...v0.8.0) (2022-09-19) + + +### Features + +* Add support for REST transport ([a1dea02](https://github.com/googleapis/python-data-qna/commit/a1dea02238950fa36cfdc0bd51cab11323f3c983)) + + +### Bug Fixes + +* **deps:** require google-api-core>=1.33.1,>=2.8.0 ([a1dea02](https://github.com/googleapis/python-data-qna/commit/a1dea02238950fa36cfdc0bd51cab11323f3c983)) +* **deps:** require protobuf >= 3.20.1 ([a1dea02](https://github.com/googleapis/python-data-qna/commit/a1dea02238950fa36cfdc0bd51cab11323f3c983)) + ## [0.7.1](https://github.com/googleapis/python-data-qna/compare/v0.7.0...v0.7.1) (2022-08-11) diff --git a/setup.py b/setup.py index fe7d9ce..5dca05c 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ import setuptools # type: ignore -version = "0.7.1" +version = "0.8.0" package_root = os.path.abspath(os.path.dirname(__file__))