Make Azure URI formatting more robust

Author: hjh320

+llms/+internal/callAzureChatAPI.m

@@ -61,11 +61,13 @@
     nvp.sendRequestFcn
 end
 
-URL = endpoint + "openai/deployments/" + deploymentID + "/chat/completions?api-version=" + nvp.APIVersion;
+URL = matlab.net.URI(endpoint);
+URL.Path = [URL.Path, "openai", "deployments", deploymentID, "chat", "completions"];
+URL.Query = matlab.net.QueryParameter("api-version", nvp.APIVersion);
 
 parameters = buildParametersCall(messages, functions, nvp);
 
-[response, streamedText] = nvp.sendRequestFcn(parameters,nvp.APIKey, URL, nvp.TimeOut, nvp.StreamFun);
+[response, streamedText] = nvp.sendRequestFcn(parameters,nvp.APIKey, URL.EncodedURI, nvp.TimeOut, nvp.StreamFun);
 
 % For old models like GPT-3.5, we may have to change the request sent a
 % little. Since we cannot detect the model used other than trying to send a
@@ -75,7 +77,7 @@
         isfield(response.Body.Data.error,"message") && ...
         response.Body.Data.error.message == "Unrecognized request argument supplied: max_completion_tokens"
     parameters = renameStructField(parameters,'max_completion_tokens','max_tokens');
-    [response, streamedText] = nvp.sendRequestFcn(parameters,nvp.APIKey, URL, nvp.TimeOut, nvp.StreamFun);
+    [response, streamedText] = nvp.sendRequestFcn(parameters,nvp.APIKey, URL.EncodedURI, nvp.TimeOut, nvp.StreamFun);
 end
 
 % If call errors, "choices" will not be part of response.Body.Data, instead

tests/tazureChat.m

@@ -65,6 +65,31 @@ function sendsSystemPrompt(testCase)
                 });
             testCase.verifyEqual(response,"Hello");
         end
+        
+        function formatsURLCorrectly(testCase)
+            [sendRequestMock,sendRequestBehaviour] = ...
+                createMock(testCase, AddedMethods="sendRequest");
+            testCase.assignOutputsWhen( ...
+                withAnyInputs(sendRequestBehaviour.sendRequest),...
+                testCase.responseMessage("Hello"),"This output is unused with Stream=false");
+
+            endpoint = "https://some.domain/without.final.forward.slash";
+            deploymentID = "someDeploymentID";
+            apiVersion = "2025-04-01-preview";
+            chat = testCase.constructor("You are a helpful assistant", ...
+                Endpoint=endpoint, ...
+                DeploymentID=deploymentID, ...
+                APIVersion=apiVersion);
+            chat.sendRequestFcn = @(varargin) sendRequestMock.sendRequest(varargin{:});
+
+            testCase.verifyWarningFree(@() generate(chat,"Hi"));
+
+            calls = testCase.getMockHistory(sendRequestMock);
+            URI = calls.Inputs{4};
+            expectedURI = endpoint + "/openai/deployments/" + deploymentID + ...
+                "/chat/completions?api-version=" + apiVersion;
+            testCase.verifyEqual(URI, expectedURI);
+        end
 
         function endpointNotFound(testCase)
             % to verify the error, we need to unset the environment variable