Update _client.py

Author: bbatha

src/gradient/_client.py

@@ -633,23 +633,11 @@ def copy(
 
         http_client = http_client or self._client
         client = self.__class__(
-<<<<<<< HEAD
-            api_key=api_key or self.api_key,
-            inference_key=inference_key or self.inference_key,
-            agent_key=agent_key or self.agent_key,
-            agent_endpoint=agent_endpoint or self._agent_endpoint,
-||||||| eb1dcf7
-            api_key=api_key or self.api_key,
-            inference_key=inference_key or self.inference_key,
-            agent_key=agent_key or self.agent_key,
-            agent_domain=agent_domain or self.agent_domain,
-=======
-            access_token=access_token or self.access_token,
-            model_access_key=model_access_key or self.model_access_key,
-            agent_access_key=agent_access_key or self.agent_access_key,
+            access_token=access_token or api_key or self.access_token,
+            model_access_key=model_access_key or inference_key or self.model_access_key,
+            agent_access_key=agent_access_key or agent_key or self.agent_access_key,
             agent_endpoint=agent_endpoint or self.agent_endpoint,
             inference_endpoint=inference_endpoint or self.inference_endpoint,
->>>>>>> origin/generated--merge-conflict
             base_url=base_url or self.base_url,
             timeout=self.timeout if isinstance(timeout, NotGiven) else timeout,
             http_client=http_client,