diff --git a/deepgram/clients/abstract_async_client.py b/deepgram/clients/abstract_async_client.py index 5909ec80..ecf4cd5f 100644 --- a/deepgram/clients/abstract_async_client.py +++ b/deepgram/clients/abstract_async_client.py @@ -41,6 +41,7 @@ async def get( url: str, options: Optional[Dict] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, **kwargs, ) -> str: @@ -49,8 +50,8 @@ async def get( url, params=options, addons=addons, + headers=headers, timeout=timeout, - headers=self.config.headers, **kwargs, ) @@ -59,6 +60,7 @@ async def post_file( url: str, options: Optional[Dict] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, file_result: Optional[List] = None, **kwargs, @@ -69,8 +71,8 @@ async def post_file( file_result=file_result, params=options, addons=addons, + headers=headers, timeout=timeout, - headers=self.config.headers, **kwargs, ) @@ -79,6 +81,7 @@ async def post( url: str, options: Optional[Dict] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, **kwargs, ) -> str: @@ -87,8 +90,8 @@ async def post( url, params=options, addons=addons, + headers=headers, timeout=timeout, - headers=self.config.headers, **kwargs, ) @@ -97,6 +100,7 @@ async def put( url: str, options: Optional[Dict] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, **kwargs, ) -> str: @@ -105,8 +109,8 @@ async def put( url, params=options, addons=addons, + headers=headers, timeout=timeout, - headers=self.config.headers, **kwargs, ) @@ -115,6 +119,7 @@ async def patch( url: str, options: Optional[Dict] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, **kwargs, ) -> str: @@ -123,8 +128,8 @@ async def patch( url, params=options, addons=addons, + headers=headers, timeout=timeout, - headers=self.config.headers, **kwargs, ) @@ -133,6 +138,7 @@ async def delete( url: str, options: Optional[Dict] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, **kwargs, ) -> str: @@ -141,8 +147,8 @@ async def delete( url, params=options, addons=addons, + headers=headers, timeout=timeout, - headers=self.config.headers, **kwargs, ) @@ -152,24 +158,26 @@ async def _handle_request( url: str, params: Optional[Dict] = None, addons: Optional[Dict] = None, - timeout: Optional[httpx.Timeout] = None, headers: Optional[Dict] = None, + timeout: Optional[httpx.Timeout] = None, file_result: Optional[List] = None, **kwargs, ): - new_url = url + _url = url if params is not None: - new_url = append_query_params(new_url, params) + _url = append_query_params(_url, params) if addons is not None: - new_url = append_query_params(new_url, addons) - + _url = append_query_params(_url, addons) + _headers = self.config.headers + if headers is not None: + _headers.update(headers) if timeout is None: timeout = httpx.Timeout(30.0, connect=10.0) try: async with httpx.AsyncClient(timeout=timeout) as client: response = await client.request( - method, new_url, headers=headers, **kwargs + method, _url, headers=_headers, **kwargs ) response.raise_for_status() diff --git a/deepgram/clients/abstract_sync_client.py b/deepgram/clients/abstract_sync_client.py index 27aea8c5..35161c26 100644 --- a/deepgram/clients/abstract_sync_client.py +++ b/deepgram/clients/abstract_sync_client.py @@ -40,6 +40,7 @@ def get( url: str, options: Optional[Dict] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, **kwargs, ) -> str: @@ -48,7 +49,7 @@ def get( url, params=options, addons=addons, - headers=self.config.headers, + headers=headers, timeout=timeout, **kwargs, ) @@ -58,6 +59,7 @@ def post_file( url: str, options: Optional[Dict] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, file_result: Optional[List] = None, **kwargs, @@ -68,7 +70,7 @@ def post_file( file_result=file_result, params=options, addons=addons, - headers=self.config.headers, + headers=headers, timeout=timeout, **kwargs, ) @@ -78,6 +80,7 @@ def post( url: str, options: Optional[Dict] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, **kwargs, ) -> str: @@ -86,7 +89,7 @@ def post( url, params=options, addons=addons, - headers=self.config.headers, + headers=headers, timeout=timeout, **kwargs, ) @@ -96,6 +99,7 @@ def put( url: str, options: Optional[Dict] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, **kwargs, ) -> str: @@ -104,7 +108,7 @@ def put( url, params=options, addons=addons, - headers=self.config.headers, + headers=headers, timeout=timeout, **kwargs, ) @@ -114,6 +118,7 @@ def patch( url: str, options: Optional[Dict] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, **kwargs, ) -> str: @@ -122,7 +127,7 @@ def patch( url, params=options, addons=addons, - headers=self.config.headers, + headers=headers, timeout=timeout, **kwargs, ) @@ -132,6 +137,7 @@ def delete( url: str, options: Optional[Dict] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, **kwargs, ) -> str: @@ -140,7 +146,7 @@ def delete( url, params=options, addons=addons, - headers=self.config.headers, + headers=headers, timeout=timeout, **kwargs, ) @@ -151,23 +157,25 @@ def _handle_request( url: str, params: Optional[Dict] = None, addons: Optional[Dict] = None, - timeout: Optional[httpx.Timeout] = None, headers: Optional[Dict] = None, + timeout: Optional[httpx.Timeout] = None, file_result: Optional[List] = None, **kwargs, ): - new_url = url + _url = url if params is not None: - new_url = append_query_params(new_url, params) + _url = append_query_params(_url, params) if addons is not None: - new_url = append_query_params(new_url, addons) - + _url = append_query_params(_url, addons) + _headers = self.config.headers + if headers is not None: + _headers.update(headers) if timeout is None: timeout = httpx.Timeout(30.0, connect=10.0) try: with httpx.Client(timeout=timeout) as client: - response = client.request(method, new_url, headers=headers, **kwargs) + response = client.request(method, _url, headers=_headers, **kwargs) response.raise_for_status() # handle file response diff --git a/deepgram/clients/analyze/v1/async_client.py b/deepgram/clients/analyze/v1/async_client.py index 4177c40a..640c6312 100644 --- a/deepgram/clients/analyze/v1/async_client.py +++ b/deepgram/clients/analyze/v1/async_client.py @@ -56,6 +56,7 @@ async def analyze_url( source: UrlSource, options: Optional[Union[AnalyzeOptions, Dict]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/read", ) -> AnalyzeResponse: @@ -64,7 +65,13 @@ async def analyze_url( if options is not None and options["callback"] is not None: self.logger.debug("AsyncAnalyzeClient.analyze_url LEAVE") return await self.analyze_url_callback( - source, options["callback"], options, addons, timeout, endpoint + source, + callback=options["callback"], + options=options, + headers=headers, + addons=addons, + timeout=timeout, + endpoint=endpoint, ) url = f"{self.config.url}/{endpoint}" @@ -87,8 +94,14 @@ async def analyze_url( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = await self.post( - url, options=options, addons=addons, json=body, timeout=timeout + url, + options=options, + addons=addons, + headers=headers, + json=body, + timeout=timeout, ) self.logger.info("json: %s", result) res = AnalyzeResponse.from_json(result) @@ -119,6 +132,7 @@ async def analyze_url_callback( callback: str, options: Optional[Union[AnalyzeOptions, Dict]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/read", ) -> AsyncAnalyzeResponse: @@ -150,8 +164,14 @@ async def analyze_url_callback( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = await self.post( - url, options=options, addons=addons, json=body, timeout=timeout + url, + options=options, + addons=addons, + headers=headers, + json=body, + timeout=timeout, ) self.logger.info("json: %s", result) res = AsyncAnalyzeResponse.from_json(result) @@ -180,6 +200,7 @@ async def analyze_text( source: TextSource, options: Optional[Union[AnalyzeOptions, Dict]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/read", ) -> AnalyzeResponse: @@ -188,7 +209,13 @@ async def analyze_text( if options is not None and options["callback"] is not None: self.logger.debug("AsyncAnalyzeClient.analyze_text LEAVE") return await self.analyze_text_callback( - source, options["callback"], options, addons, timeout, endpoint + source, + callback=options["callback"], + options=options, + headers=headers, + addons=addons, + timeout=timeout, + endpoint=endpoint, ) url = f"{self.config.url}/{endpoint}" @@ -212,8 +239,14 @@ async def analyze_text( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = await self.post( - url, options=options, addons=addons, content=body, timeout=timeout + url, + options=options, + addons=addons, + headers=headers, + content=body, + timeout=timeout, ) self.logger.info("json: %s", result) res = AnalyzeResponse.from_json(result) @@ -244,6 +277,7 @@ async def analyze_text_callback( callback: str, options: Optional[Union[AnalyzeOptions, Dict]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/read", ) -> AsyncAnalyzeResponse: @@ -276,8 +310,14 @@ async def analyze_text_callback( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = await self.post( - url, options=options, addons=addons, json=body, timeout=timeout + url, + options=options, + addons=addons, + headers=headers, + json=body, + timeout=timeout, ) self.logger.info("json: %s", result) res = AsyncAnalyzeResponse.from_json(result) diff --git a/deepgram/clients/analyze/v1/client.py b/deepgram/clients/analyze/v1/client.py index e5987373..9152ec86 100644 --- a/deepgram/clients/analyze/v1/client.py +++ b/deepgram/clients/analyze/v1/client.py @@ -56,6 +56,7 @@ def analyze_url( source: UrlSource, options: Optional[Union[AnalyzeOptions, Dict]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/read", ) -> Union[AnalyzeResponse, AsyncAnalyzeResponse]: @@ -66,7 +67,13 @@ def analyze_url( ): self.logger.debug("AnalyzeClient.analyze_url LEAVE") return self.analyze_url_callback( - source, options["callback"], options, addons, timeout, endpoint + source, + callback=options.callback, + options=options, + addons=addons, + headers=headers, + timeout=timeout, + endpoint=endpoint, ) url = f"{self.config.url}/{endpoint}" @@ -89,8 +96,14 @@ def analyze_url( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = self.post( - url, options=options, addons=addons, json=body, timeout=timeout + url, + options=options, + addons=addons, + headers=headers, + json=body, + timeout=timeout, ) self.logger.info("json: %s", result) res = AnalyzeResponse.from_json(result) @@ -121,6 +134,7 @@ def analyze_url_callback( callback: str, options: Optional[Union[AnalyzeOptions, Dict]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/read", ) -> AsyncAnalyzeResponse: @@ -152,8 +166,14 @@ def analyze_url_callback( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = self.post( - url, options=options, addons=addons, json=body, timeout=timeout + url, + options=options, + addons=addons, + headers=headers, + json=body, + timeout=timeout, ) self.logger.info("json: %s", result) res = AsyncAnalyzeResponse.from_json(result) @@ -182,6 +202,7 @@ def analyze_text( source: TextSource, options: Optional[Union[AnalyzeOptions, Dict]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/read", ) -> Union[AnalyzeResponse, AsyncAnalyzeResponse]: @@ -192,7 +213,13 @@ def analyze_text( ): self.logger.debug("AnalyzeClient.analyze_text LEAVE") return self.analyze_text_callback( - source, options["callback"], options, addons, timeout, endpoint + source, + callback=options.callback, + options=options, + addons=addons, + headers=headers, + timeout=timeout, + endpoint=endpoint, ) url = f"{self.config.url}/{endpoint}" @@ -216,8 +243,14 @@ def analyze_text( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = self.post( - url, options=options, addons=addons, content=body, timeout=timeout + url, + options=options, + addons=addons, + headers=headers, + content=body, + timeout=timeout, ) self.logger.info("json: %s", result) res = AnalyzeResponse.from_json(result) @@ -248,6 +281,7 @@ def analyze_file_callback( callback: str, options: Optional[Union[AnalyzeOptions, Dict]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/read", ) -> AsyncAnalyzeResponse: @@ -280,8 +314,14 @@ def analyze_file_callback( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = self.post( - url, options=options, addons=addons, json=body, timeout=timeout + url, + options=options, + addons=addons, + headers=headers, + json=body, + timeout=timeout, ) self.logger.info("json: %s", result) res = AsyncAnalyzeResponse.from_json(result) diff --git a/deepgram/clients/live/v1/async_client.py b/deepgram/clients/live/v1/async_client.py index 97a7d987..ba8959e9 100644 --- a/deepgram/clients/live/v1/async_client.py +++ b/deepgram/clients/live/v1/async_client.py @@ -58,6 +58,7 @@ async def start( self, options: Optional[Union[LiveOptions, Dict]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, members: Optional[Dict] = None, **kwargs, ) -> bool: @@ -67,6 +68,7 @@ async def start( self.logger.debug("AsyncLiveClient.start ENTER") self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) self.logger.info("members: %s", members) self.logger.info("kwargs: %s", kwargs) @@ -82,6 +84,7 @@ async def start( self.options = options self.addons = addons + self.headers = headers # add "members" as members of the class if members is not None: @@ -100,16 +103,23 @@ async def start( combined_options = self.options if addons is not None: self.logger.info("merging addons to options") - combined_options.update(addons) + combined_options.update(self.addons) self.logger.info("new options: %s", combined_options) self.logger.debug("combined_options: %s", combined_options) + combined_headers = self.config.headers + if headers is not None: + self.logger.info("merging headers to options") + combined_headers.update(self.headers) + self.logger.info("new headers: %s", combined_headers) + self.logger.debug("combined_headers: %s", combined_headers) + url_with_params = append_query_params(self.websocket_url, combined_options) try: self._socket = await websockets.connect( url_with_params, - extra_headers=self.config.headers, + extra_headers=combined_headers, ping_interval=PING_INTERVAL, ) self._exit_event = asyncio.Event() diff --git a/deepgram/clients/live/v1/client.py b/deepgram/clients/live/v1/client.py index 7090c958..f60ef21e 100644 --- a/deepgram/clients/live/v1/client.py +++ b/deepgram/clients/live/v1/client.py @@ -60,6 +60,7 @@ def start( self, options: Optional[Union[LiveOptions, Dict]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, members: Optional[Dict] = None, **kwargs, ) -> bool: @@ -69,6 +70,7 @@ def start( self.logger.debug("LiveClient.start ENTER") self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) self.logger.info("members: %s", members) self.logger.info("kwargs: %s", kwargs) @@ -84,6 +86,7 @@ def start( self.options = options self.addons = addons + self.headers = headers # add "members" as members of the class if members is not None: @@ -102,15 +105,20 @@ def start( combined_options = self.options if addons is not None: self.logger.info("merging addons to options") - combined_options.update(addons) + combined_options.update(self.addons) self.logger.info("new options: %s", combined_options) self.logger.debug("combined_options: %s", combined_options) + combined_headers = self.config.headers + if headers is not None: + self.logger.info("merging headers to options") + combined_headers.update(self.headers) + self.logger.info("new headers: %s", combined_headers) + self.logger.debug("combined_headers: %s", combined_headers) + url_with_params = append_query_params(self.websocket_url, combined_options) try: - self._socket = connect( - url_with_params, additional_headers=self.config.headers - ) + self._socket = connect(url_with_params, additional_headers=combined_headers) self._exit_event = threading.Event() self._lock_send = threading.Lock() diff --git a/deepgram/clients/manage/v1/async_client.py b/deepgram/clients/manage/v1/async_client.py index bde77bc9..aacb2548 100644 --- a/deepgram/clients/manage/v1/async_client.py +++ b/deepgram/clients/manage/v1/async_client.py @@ -66,17 +66,21 @@ async def list_projects( self, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> ProjectsResponse: """ Please see get_projects for more information. """ - return await self.get_projects(timeout=timeout, addons=addons, **kwargs) + return await self.get_projects( + timeout=timeout, addons=addons, headers=headers, **kwargs + ) async def get_projects( self, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> ProjectsResponse: """ @@ -89,7 +93,10 @@ async def get_projects( url = f"{self.config.url}/{self.endpoint}" self.logger.info("url: %s", url) self.logger.info("addons: %s", addons) - result = await self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = await self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("result: %s", result) res = ProjectsResponse.from_json(result) self.logger.verbose("result: %s", res) @@ -102,6 +109,7 @@ async def get_project( project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Project: """ @@ -115,7 +123,10 @@ async def get_project( self.logger.info("url: %s", url) self.logger.info("project_id: %s", project_id) self.logger.info("addons: %s", addons) - result = await self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = await self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("result: %s", result) res = Project.from_json(result) self.logger.verbose("result: %s", res) @@ -129,6 +140,7 @@ async def update_project_option( options: Union[Dict, ProjectOptions], timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -146,8 +158,9 @@ async def update_project_option( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = await self.patch( - url, json=options, timeout=timeout, addons=addons, **kwargs + url, json=options, timeout=timeout, addons=addons, headers=headers, **kwargs ) self.logger.info("result: %s", result) res = Message.from_json(result) @@ -162,6 +175,7 @@ async def update_project( name="", timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -179,8 +193,9 @@ async def update_project( self.logger.info("project_id: %s", project_id) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = await self.patch( - url, json=options, timeout=timeout, addons=addons, **kwargs + url, json=options, timeout=timeout, addons=addons, headers=headers, **kwargs ) self.logger.info("result: %s", result) res = Message.from_json(result) @@ -194,6 +209,7 @@ async def delete_project( project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -205,7 +221,10 @@ async def delete_project( self.logger.debug("ManageClient.delete_project ENTER") url = f"{self.config.url}/{self.endpoint}/{project_id}" self.logger.info("addons: %s", addons) - result = await self.delete(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = await self.delete( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("result: %s", result) res = Message.from_json(result) self.logger.verbose("result: %s", res) @@ -219,18 +238,22 @@ async def list_keys( project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> KeysResponse: """ Please see get_keys for more information. """ - return await self.get_keys(project_id, timeout=timeout, addons=addons, **kwargs) + return await self.get_keys( + project_id, timeout=timeout, addons=addons, headers=headers, **kwargs + ) async def get_keys( self, project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> KeysResponse: """ @@ -244,7 +267,10 @@ async def get_keys( self.logger.info("url: %s", url) self.logger.info("project_id: %s", project_id) self.logger.info("addons: %s", addons) - result = await self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = await self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("result: %s", result) res = KeysResponse.from_json(result) self.logger.verbose("result: %s", res) @@ -258,6 +284,7 @@ async def get_key( key_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> KeyResponse: """ @@ -272,7 +299,10 @@ async def get_key( self.logger.info("project_id: %s", project_id) self.logger.info("key_id: %s", key_id) self.logger.info("addons: %s", addons) - result = await self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = await self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("result: %s", result) res = KeyResponse.from_json(result) self.logger.verbose("result: %s", res) @@ -286,6 +316,7 @@ async def create_key( options: Union[Dict, KeyOptions], timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Key: """ @@ -303,8 +334,9 @@ async def create_key( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = await self.post( - url, json=options, timeout=timeout, addons=addons, **kwargs + url, json=options, timeout=timeout, addons=addons, headers=headers, **kwargs ) self.logger.info("result: %s", result) res = Key.from_json(result) @@ -319,6 +351,7 @@ async def delete_key( key_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -333,7 +366,10 @@ async def delete_key( self.logger.info("project_id: %s", project_id) self.logger.info("key_id: %s", key_id) self.logger.info("addons: %s", addons) - result = await self.delete(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = await self.delete( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("result: %s", result) res = Message.from_json(result) self.logger.verbose("result: %s", res) @@ -347,13 +383,14 @@ async def list_members( project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> MembersResponse: """ Please see get_members for more information. """ return await self.get_members( - project_id, timeout=timeout, addons=addons, **kwargs + project_id, timeout=timeout, addons=addons, headers=headers, **kwargs ) async def get_members( @@ -361,6 +398,7 @@ async def get_members( project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> MembersResponse: """ @@ -374,7 +412,10 @@ async def get_members( self.logger.info("url: %s", url) self.logger.info("project_id: %s", project_id) self.logger.info("addons: %s", addons) - result = await self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = await self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("result: %s", result) res = MembersResponse.from_json(result) self.logger.verbose("result: %s", res) @@ -388,6 +429,7 @@ async def remove_member( member_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -402,7 +444,10 @@ async def remove_member( self.logger.info("project_id: %s", project_id) self.logger.info("member_id: %s", member_id) self.logger.info("addons: %s", addons) - result = await self.delete(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = await self.delete( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("result: %s", result) res = Message.from_json(result) self.logger.verbose("result: %s", res) @@ -417,6 +462,7 @@ async def get_member_scopes( member_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> ScopesResponse: """ @@ -433,7 +479,10 @@ async def get_member_scopes( self.logger.info("project_id: %s", project_id) self.logger.info("member_id: %s", member_id) self.logger.info("addons: %s", addons) - result = await self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = await self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("result: %s", result) res = ScopesResponse.from_json(result) self.logger.verbose("result: %s", res) @@ -448,6 +497,7 @@ async def update_member_scope( options: Union[Dict, ScopeOptions], timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -467,8 +517,9 @@ async def update_member_scope( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = await self.put( - url, json=options, timeout=timeout, addons=addons, **kwargs + url, json=options, timeout=timeout, addons=addons, headers=headers, **kwargs ) self.logger.info("result: %s", result) res = Message.from_json(result) @@ -483,13 +534,14 @@ async def list_invites( project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> InvitesResponse: """ Please see get_invites for more information. """ return await self.get_invites( - project_id, timeout=timeout, addons=addons, **kwargs + project_id, timeout=timeout, addons=addons, headers=headers, **kwargs ) async def get_invites( @@ -497,6 +549,7 @@ async def get_invites( project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> InvitesResponse: """ @@ -510,7 +563,10 @@ async def get_invites( self.logger.info("url: %s", url) self.logger.info("project_id: %s", project_id) self.logger.info("addons: %s", addons) - result = await self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = await self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("result: %s", result) res = InvitesResponse.from_json(result) self.logger.verbose("result: %s", res) @@ -524,6 +580,7 @@ async def send_invite_options( options: Union[Dict, InviteOptions], timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -541,8 +598,9 @@ async def send_invite_options( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = await self.post( - url, json=options, timeout=timeout, addons=addons, **kwargs + url, json=options, timeout=timeout, addons=addons, headers=headers, **kwargs ) self.logger.info("result: %s", result) res = Message.from_json(result) @@ -558,6 +616,7 @@ async def send_invite( scope="member", timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -576,8 +635,9 @@ async def send_invite( self.logger.info("project_id: %s", project_id) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = await self.post( - url, json=options, timeout=timeout, addons=addons, **kwargs + url, json=options, timeout=timeout, addons=addons, headers=headers, **kwargs ) self.logger.info("result: %s", result) res = Message.from_json(result) @@ -592,6 +652,7 @@ async def delete_invite( email: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -606,7 +667,10 @@ async def delete_invite( self.logger.info("project_id: %s", project_id) self.logger.info("email: %s", email) self.logger.info("addons: %s", addons) - result = await self.delete(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = await self.delete( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("result: %s", result) res = Message.from_json(result) self.logger.verbose("result: %s", res) @@ -619,6 +683,7 @@ async def leave_project( project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -632,7 +697,10 @@ async def leave_project( self.logger.info("url: %s", url) self.logger.info("project_id: %s", project_id) self.logger.info("addons: %s", addons) - result = await self.delete(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = await self.delete( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("result: %s", result) res = Message.from_json(result) self.logger.verbose("result: %s", res) @@ -647,6 +715,7 @@ async def get_usage_requests( options: Union[Dict, UsageRequestOptions], timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> UsageRequestsResponse: """ @@ -664,8 +733,14 @@ async def get_usage_requests( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = await self.get( - url, options=options, timeout=timeout, addons=addons, **kwargs + url, + options=options, + timeout=timeout, + addons=addons, + headers=headers, + **kwargs, ) self.logger.info("result: %s", result) res = UsageRequestsResponse.from_json(result) @@ -680,6 +755,7 @@ async def get_usage_request( request_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> UsageRequest: """ @@ -694,7 +770,10 @@ async def get_usage_request( self.logger.info("project_id: %s", project_id) self.logger.info("request_id: %s", request_id) self.logger.info("addons: %s", addons) - result = await self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = await self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("result: %s", result) res = UsageRequest.from_json(result) self.logger.verbose("result: %s", res) @@ -708,6 +787,7 @@ async def get_usage_summary( options: Union[Dict, UsageSummaryOptions], timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> UsageSummaryResponse: """ @@ -725,8 +805,14 @@ async def get_usage_summary( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = await self.get( - url, options=options, timeout=timeout, addons=addons, **kwargs + url, + options=options, + timeout=timeout, + addons=addons, + headers=headers, + **kwargs, ) self.logger.info("result: %s", result) res = UsageSummaryResponse.from_json(result) @@ -741,6 +827,7 @@ async def get_usage_fields( options: Union[Dict, UsageFieldsOptions], timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> UsageFieldsResponse: """ @@ -758,8 +845,14 @@ async def get_usage_fields( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = await self.get( - url, options=options, timeout=timeout, addons=addons, **kwargs + url, + options=options, + timeout=timeout, + addons=addons, + headers=headers, + **kwargs, ) self.logger.info("result: %s", result) res = UsageFieldsResponse.from_json(result) @@ -774,13 +867,14 @@ async def list_balances( project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> BalancesResponse: """ Please see get_balances for more information. """ return await self.get_balances( - project_id, timeout=timeout, addons=addons, **kwargs + project_id, timeout=timeout, addons=addons, headers=headers, **kwargs ) async def get_balances( @@ -788,6 +882,7 @@ async def get_balances( project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> BalancesResponse: """ @@ -801,7 +896,10 @@ async def get_balances( self.logger.info("url: %s", url) self.logger.info("project_id: %s", project_id) self.logger.info("addons: %s", addons) - result = await self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = await self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("result: %s", result) res = BalancesResponse.from_json(result) self.logger.verbose("result: %s", res) @@ -815,6 +913,7 @@ async def get_balance( balance_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Balance: """ @@ -829,7 +928,10 @@ async def get_balance( self.logger.info("project_id: %s", project_id) self.logger.info("balance_id: %s", balance_id) self.logger.info("addons: %s", addons) - result = await self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = await self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("result: %s", result) res = Balance.from_json(result) self.logger.verbose("result: %s", res) diff --git a/deepgram/clients/manage/v1/client.py b/deepgram/clients/manage/v1/client.py index d44e6114..46016b24 100644 --- a/deepgram/clients/manage/v1/client.py +++ b/deepgram/clients/manage/v1/client.py @@ -67,17 +67,21 @@ def list_projects( self, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> ProjectsResponse: """ List all projects for the current user. """ - return self.get_projects(timeout=timeout, addons=addons, **kwargs) + return self.get_projects( + timeout=timeout, addons=addons, headers=headers, **kwargs + ) def get_projects( self, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> ProjectsResponse: """ @@ -90,7 +94,10 @@ def get_projects( url = f"{self.config.url}/{self.endpoint}" self.logger.info("url: %s", url) self.logger.info("addons: %s", addons) - result = self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = ProjectsResponse.from_json(result) self.logger.verbose("result: %s", res) @@ -103,6 +110,7 @@ def get_project( project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Project: """ @@ -116,7 +124,10 @@ def get_project( self.logger.info("url: %s", url) self.logger.info("project_id: %s", project_id) self.logger.info("addons: %s", addons) - result = self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = Project.from_json(result) self.logger.verbose("result: %s", res) @@ -130,6 +141,7 @@ def update_project_option( options: Union[Dict, ProjectOptions], timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -147,7 +159,10 @@ def update_project_option( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) - result = self.patch(url, json=options, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.patch( + url, json=options, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = Message.from_json(result) self.logger.verbose("result: %s", res) @@ -161,6 +176,7 @@ def update_project( name: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -178,7 +194,10 @@ def update_project( self.logger.info("project_id: %s", project_id) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) - result = self.patch(url, json=options, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.patch( + url, json=options, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = Message.from_json(result) self.logger.verbose("result: %s", res) @@ -191,6 +210,7 @@ def delete_project( project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -202,7 +222,10 @@ def delete_project( self.logger.debug("ManageClient.delete_project ENTER") url = f"{self.config.url}/{self.endpoint}/{project_id}" self.logger.info("addons: %s", addons) - result = self.delete(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.delete( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = Message.from_json(result) self.logger.verbose("result: %s", res) @@ -216,18 +239,22 @@ def list_keys( project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> KeysResponse: """ Please see get_keys for more information. """ - return self.get_keys(project_id, timeout=timeout, addons=addons, **kwargs) + return self.get_keys( + project_id, timeout=timeout, addons=addons, headers=headers, **kwargs + ) def get_keys( self, project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> KeysResponse: """ @@ -241,7 +268,10 @@ def get_keys( self.logger.info("url: %s", url) self.logger.info("project_id: %s", project_id) self.logger.info("addons: %s", addons) - result = self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = KeysResponse.from_json(result) self.logger.verbose("result: %s", res) @@ -255,6 +285,7 @@ def get_key( key_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> KeyResponse: """ @@ -269,7 +300,10 @@ def get_key( self.logger.info("project_id: %s", project_id) self.logger.info("key_id: %s", key_id) self.logger.info("addons: %s", addons) - result = self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = KeyResponse.from_json(result) self.logger.verbose("result: %s", res) @@ -283,6 +317,7 @@ def create_key( options: Union[Dict, KeyOptions], timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Key: """ @@ -300,7 +335,10 @@ def create_key( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) - result = self.post(url, json=options, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.post( + url, json=options, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = Key.from_json(result) self.logger.verbose("result: %s", res) @@ -314,6 +352,7 @@ def delete_key( key_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -328,7 +367,10 @@ def delete_key( self.logger.info("project_id: %s", project_id) self.logger.info("key_id: %s", key_id) self.logger.info("addons: %s", addons) - result = self.delete(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.delete( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = Message.from_json(result) self.logger.verbose("result: %s", res) @@ -342,18 +384,22 @@ def list_members( project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> MembersResponse: """ Please see get_members for more information. """ - return self.get_members(project_id, timeout=timeout, addons=addons, **kwargs) + return self.get_members( + project_id, timeout=timeout, addons=addons, headers=headers, **kwargs + ) def get_members( self, project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> MembersResponse: """ @@ -367,7 +413,10 @@ def get_members( self.logger.info("url: %s", url) self.logger.info("project_id: %s", project_id) self.logger.info("addons: %s", addons) - result = self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = MembersResponse.from_json(result) self.logger.verbose("result: %s", res) @@ -381,6 +430,7 @@ def remove_member( member_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -395,7 +445,10 @@ def remove_member( self.logger.info("project_id: %s", project_id) self.logger.info("member_id: %s", member_id) self.logger.info("addons: %s", addons) - result = self.delete(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.delete( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = Message.from_json(result) self.logger.verbose("result: %s", res) @@ -410,6 +463,7 @@ def get_member_scopes( member_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> ScopesResponse: """ @@ -426,7 +480,10 @@ def get_member_scopes( self.logger.info("project_id: %s", project_id) self.logger.info("member_id: %s", member_id) self.logger.info("addons: %s", addons) - result = self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = ScopesResponse.from_json(result) self.logger.verbose("result: %s", res) @@ -441,6 +498,7 @@ def update_member_scope( options: Union[Dict, ScopeOptions], timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -460,7 +518,10 @@ def update_member_scope( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) - result = self.put(url, json=options, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.put( + url, json=options, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = Message.from_json(result) self.logger.verbose("result: %s", res) @@ -474,18 +535,22 @@ def list_invites( project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> InvitesResponse: """ Please see get_invites for more information. """ - return self.get_invites(project_id, timeout=timeout, addons=addons, **kwargs) + return self.get_invites( + project_id, timeout=timeout, addons=addons, headers=headers, **kwargs + ) def get_invites( self, project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> InvitesResponse: """ @@ -499,7 +564,10 @@ def get_invites( self.logger.info("url: %s", url) self.logger.info("project_id: %s", project_id) self.logger.info("addons: %s", addons) - result = self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = InvitesResponse.from_json(result) self.logger.verbose("result: %s", res) @@ -513,6 +581,7 @@ def send_invite_options( options: Union[Dict, InviteOptions], timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -530,7 +599,10 @@ def send_invite_options( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) - result = self.post(url, json=options, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.post( + url, json=options, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = Message.from_json(result) self.logger.verbose("result: %s", res) @@ -545,6 +617,7 @@ def send_invite( scope="member", timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -563,7 +636,10 @@ def send_invite( self.logger.info("project_id: %s", project_id) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) - result = self.post(url, json=options, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.post( + url, json=options, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = Message.from_json(result) self.logger.verbose("result: %s", res) @@ -577,6 +653,7 @@ def delete_invite( email: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -591,7 +668,10 @@ def delete_invite( self.logger.info("project_id: %s", project_id) self.logger.info("email: %s", email) self.logger.info("addons: %s", addons) - result = self.delete(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.delete( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = Message.from_json(result) self.logger.verbose("result: %s", res) @@ -604,6 +684,7 @@ def leave_project( project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Message: """ @@ -617,7 +698,10 @@ def leave_project( self.logger.info("url: %s", url) self.logger.info("project_id: %s", project_id) self.logger.info("addons: %s", addons) - result = self.delete(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.delete( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = Message.from_json(result) self.logger.verbose("result: %s", res) @@ -632,6 +716,7 @@ def get_usage_requests( options: Union[Dict, UsageRequestOptions], timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> UsageRequestsResponse: """ @@ -649,8 +734,14 @@ def get_usage_requests( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = self.get( - url, options=options, timeout=timeout, addons=addons, **kwargs + url, + options=options, + timeout=timeout, + addons=addons, + headers=headers, + **kwargs, ) self.logger.info("json: %s", result) res = UsageRequestsResponse.from_json(result) @@ -665,6 +756,7 @@ def get_usage_request( request_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> UsageRequest: """ @@ -679,7 +771,10 @@ def get_usage_request( self.logger.info("project_id: %s", project_id) self.logger.info("request_id: %s", request_id) self.logger.info("addons: %s", addons) - result = self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = UsageRequest.from_json(result) self.logger.verbose("result: %s", res) @@ -693,6 +788,7 @@ def get_usage_summary( options: Union[Dict, UsageSummaryOptions], timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> UsageSummaryResponse: """ @@ -710,8 +806,14 @@ def get_usage_summary( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = self.get( - url, options=options, timeout=timeout, addons=addons, **kwargs + url, + options=options, + timeout=timeout, + addons=addons, + headers=headers, + **kwargs, ) self.logger.info("json: %s", result) res = UsageSummaryResponse.from_json(result) @@ -726,6 +828,7 @@ def get_usage_fields( options: Union[Dict, UsageFieldsOptions], timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> UsageFieldsResponse: """ @@ -743,8 +846,14 @@ def get_usage_fields( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = self.get( - url, options=options, timeout=timeout, addons=addons, **kwargs + url, + options=options, + timeout=timeout, + addons=addons, + headers=headers, + **kwargs, ) self.logger.info("json: %s", result) res = UsageFieldsResponse.from_json(result) @@ -759,18 +868,22 @@ def list_balances( project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> BalancesResponse: """ Please see get_balances for more information. """ - return self.get_balances(project_id, timeout=timeout, addons=addons, **kwargs) + return self.get_balances( + project_id, timeout=timeout, addons=addons, headers=headers, **kwargs + ) def get_balances( self, project_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> BalancesResponse: """ @@ -784,7 +897,10 @@ def get_balances( self.logger.info("url: %s", url) self.logger.info("project_id: %s", project_id) self.logger.info("addons: %s", addons) - result = self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = BalancesResponse.from_json(result) self.logger.verbose("result: %s", res) @@ -798,6 +914,7 @@ def get_balance( balance_id: str, timeout: Optional[httpx.Timeout] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, **kwargs, ) -> Balance: """ @@ -812,7 +929,10 @@ def get_balance( self.logger.info("project_id: %s", project_id) self.logger.info("balance_id: %s", balance_id) self.logger.info("addons: %s", addons) - result = self.get(url, timeout=timeout, addons=addons, **kwargs) + self.logger.info("headers: %s", headers) + result = self.get( + url, timeout=timeout, addons=addons, headers=headers, **kwargs + ) self.logger.info("json: %s", result) res = Balance.from_json(result) self.logger.verbose("result: %s", res) diff --git a/deepgram/clients/prerecorded/v1/async_client.py b/deepgram/clients/prerecorded/v1/async_client.py index f3ac4c3b..fdb60f2d 100644 --- a/deepgram/clients/prerecorded/v1/async_client.py +++ b/deepgram/clients/prerecorded/v1/async_client.py @@ -56,6 +56,7 @@ async def transcribe_url( source: UrlSource, options: Optional[Union[Dict, PrerecordedOptions]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/listen", ) -> PrerecordedResponse: @@ -66,7 +67,13 @@ async def transcribe_url( ): self.logger.debug("PreRecordedClient.transcribe_url LEAVE") return await self.transcribe_url_callback( - source, options.callback, options, addons, timeout, endpoint + source, + callback=options.callback, + options=options, + addons=addons, + headers=headers, + timeout=timeout, + endpoint=endpoint, ) url = f"{self.config.url}/{endpoint}" @@ -89,8 +96,14 @@ async def transcribe_url( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = await self.post( - url, options=options, addons=addons, json=body, timeout=timeout + url, + options=options, + addons=addons, + headers=headers, + json=body, + timeout=timeout, ) self.logger.info("json: %s", result) res = PrerecordedResponse.from_json(result) @@ -121,6 +134,7 @@ async def transcribe_url_callback( callback: str, options: Optional[Union[Dict, PrerecordedOptions]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/listen", ) -> AsyncPrerecordedResponse: @@ -152,8 +166,14 @@ async def transcribe_url_callback( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = await self.post( - url, options=options, addons=addons, json=body, timeout=timeout + url, + options=options, + addons=addons, + headers=headers, + json=body, + timeout=timeout, ) self.logger.info("json: %s", result) res = AsyncPrerecordedResponse.from_json(result) @@ -182,6 +202,7 @@ async def transcribe_file( source: FileSource, options: Optional[Union[Dict, PrerecordedOptions]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/listen", ) -> PrerecordedResponse: @@ -192,7 +213,13 @@ async def transcribe_file( ): self.logger.debug("PreRecordedClient.transcribe_file LEAVE") return await self.transcribe_file_callback( - source, options.callback, options, addons, timeout, endpoint + source, + callback=options.callback, + options=options, + addons=addons, + headers=headers, + timeout=timeout, + endpoint=endpoint, ) url = f"{self.config.url}/{endpoint}" @@ -216,8 +243,14 @@ async def transcribe_file( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = await self.post( - url, options=options, addons=addons, content=body, timeout=timeout + url, + options=options, + addons=addons, + headers=headers, + content=body, + timeout=timeout, ) self.logger.info("json: %s", result) res = PrerecordedResponse.from_json(result) @@ -248,6 +281,7 @@ async def transcribe_file_callback( callback: str, options: Optional[Union[Dict, PrerecordedOptions]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/listen", ) -> AsyncPrerecordedResponse: @@ -280,8 +314,14 @@ async def transcribe_file_callback( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = await self.post( - url, options=options, addons=addons, content=body, timeout=timeout + url, + options=options, + addons=addons, + headers=headers, + content=body, + timeout=timeout, ) self.logger.info("json: %s", result) res = AsyncPrerecordedResponse.from_json(result) diff --git a/deepgram/clients/prerecorded/v1/client.py b/deepgram/clients/prerecorded/v1/client.py index 16d09580..9d3c5461 100644 --- a/deepgram/clients/prerecorded/v1/client.py +++ b/deepgram/clients/prerecorded/v1/client.py @@ -56,6 +56,7 @@ def transcribe_url( source: UrlSource, options: Optional[Union[Dict, PrerecordedOptions]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/listen", ) -> PrerecordedResponse: @@ -66,7 +67,13 @@ def transcribe_url( ): self.logger.debug("PreRecordedClient.transcribe_url LEAVE") return self.transcribe_url_callback( - source, options.callback, options, addons, timeout, endpoint + source, + callback=options.callback, + options=options, + addons=addons, + headers=headers, + timeout=timeout, + endpoint=endpoint, ) url = f"{self.config.url}/{endpoint}" @@ -89,8 +96,14 @@ def transcribe_url( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = self.post( - url, options=options, addons=addons, json=body, timeout=timeout + url, + options=options, + addons=addons, + headers=headers, + json=body, + timeout=timeout, ) self.logger.info("json: %s", result) res = PrerecordedResponse.from_json(result) @@ -121,6 +134,7 @@ def transcribe_url_callback( callback: str, options: Optional[Union[Dict, PrerecordedOptions]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/listen", ) -> AsyncPrerecordedResponse: @@ -152,8 +166,14 @@ def transcribe_url_callback( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = self.post( - url, options=options, addons=addons, json=body, timeout=timeout + url, + options=options, + addons=addons, + headers=headers, + json=body, + timeout=timeout, ) self.logger.info("json: %s", result) res = AsyncPrerecordedResponse.from_json(result) @@ -182,6 +202,7 @@ def transcribe_file( source: FileSource, options: Optional[Union[Dict, PrerecordedOptions]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/listen", ) -> PrerecordedResponse: @@ -192,7 +213,13 @@ def transcribe_file( ): self.logger.debug("PreRecordedClient.transcribe_file LEAVE") return self.transcribe_file_callback( - source, options.callback, options, addons, timeout, endpoint + source, + callback=options.callback, + options=options, + addons=addons, + headers=headers, + timeout=timeout, + endpoint=endpoint, ) url = f"{self.config.url}/{endpoint}" @@ -216,8 +243,14 @@ def transcribe_file( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = self.post( - url, options=options, addons=addons, content=body, timeout=timeout + url, + options=options, + addons=addons, + headers=headers, + content=body, + timeout=timeout, ) self.logger.info("json: %s", result) res = PrerecordedResponse.from_json(result) @@ -248,6 +281,7 @@ def transcribe_file_callback( callback: str, options: Optional[Union[Dict, PrerecordedOptions]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/listen", ) -> AsyncPrerecordedResponse: @@ -280,8 +314,14 @@ def transcribe_file_callback( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) result = self.post( - url, options=options, addons=addons, content=body, timeout=timeout + url, + options=options, + addons=addons, + headers=headers, + content=body, + timeout=timeout, ) self.logger.info("json: %s", result) res = AsyncPrerecordedResponse.from_json(result) diff --git a/deepgram/clients/speak/v1/async_client.py b/deepgram/clients/speak/v1/async_client.py index 368c5a0f..58355ceb 100644 --- a/deepgram/clients/speak/v1/async_client.py +++ b/deepgram/clients/speak/v1/async_client.py @@ -49,6 +49,7 @@ async def stream( source: SpeakSource, options: Optional[Union[Dict, SpeakOptions]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/speak", ) -> SpeakResponse: @@ -74,6 +75,7 @@ async def stream( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) returnVals = [ "content-type", @@ -88,6 +90,7 @@ async def stream( url, options=options, addons=addons, + headers=headers, json=body, timeout=timeout, file_result=returnVals, @@ -114,12 +117,20 @@ async def save( source: SpeakSource, options: Optional[Union[Dict, SpeakOptions]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/speak", ) -> SpeakResponse: self.logger.debug("AsyncSpeakClient.save ENTER") - res = await self.stream(source, options, addons, timeout, endpoint) + res = await self.stream( + source, + options=options, + addons=addons, + headers=headers, + timeout=timeout, + endpoint=endpoint, + ) # save to file async with aiofiles.open(filename, "wb") as out: diff --git a/deepgram/clients/speak/v1/client.py b/deepgram/clients/speak/v1/client.py index 6bc88b51..b113d1a3 100644 --- a/deepgram/clients/speak/v1/client.py +++ b/deepgram/clients/speak/v1/client.py @@ -48,6 +48,7 @@ def stream( source: SpeakSource, options: Optional[Union[Dict, SpeakOptions]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/speak", ) -> SpeakResponse: @@ -73,6 +74,7 @@ def stream( options = json.loads(options.to_json()) self.logger.info("options: %s", options) self.logger.info("addons: %s", addons) + self.logger.info("headers: %s", headers) returnVals = [ "content-type", @@ -87,6 +89,7 @@ def stream( url, options=options, addons=addons, + headers=headers, json=body, timeout=timeout, file_result=returnVals, @@ -113,12 +116,20 @@ def save( source: SpeakSource, options: Optional[Union[Dict, SpeakOptions]] = None, addons: Optional[Dict] = None, + headers: Optional[Dict] = None, timeout: Optional[httpx.Timeout] = None, endpoint: str = "v1/speak", ) -> SpeakResponse: self.logger.debug("SpeakClient.save ENTER") - res = self.stream(source, options, addons, timeout, endpoint) + res = self.stream( + source, + options=options, + addons=addons, + headers=headers, + timeout=timeout, + endpoint=endpoint, + ) # save to file file = open(filename, "wb+") diff --git a/examples/manage/async_invitations/main.py b/examples/manage/async_invitations/main.py index bbbfcb65..3bf4a0c0 100644 --- a/examples/manage/async_invitations/main.py +++ b/examples/manage/async_invitations/main.py @@ -3,7 +3,6 @@ # SPDX-License-Identifier: MIT import asyncio -import os import sys from dotenv import load_dotenv @@ -11,9 +10,6 @@ load_dotenv() -# environment variables -API_KEY = os.getenv("DEEPGRAM_API_KEY") - async def main(): try: