diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore.xcodeproj/project.pbxproj b/libs/SalesforceSDKCore/SalesforceSDKCore.xcodeproj/project.pbxproj index 5563e89b4e..c0dcc9bf44 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore.xcodeproj/project.pbxproj +++ b/libs/SalesforceSDKCore/SalesforceSDKCore.xcodeproj/project.pbxproj @@ -389,17 +389,17 @@ CED452ED1D808DEE009266EB /* SFNativeRestRequestListener.h in Headers */ = {isa = PBXBuildFile; fileRef = CED452E91D808DEE009266EB /* SFNativeRestRequestListener.h */; }; CED452EF1D808E0A009266EB /* SFNativeRestRequestListener.m in Sources */ = {isa = PBXBuildFile; fileRef = CED452EA1D808DEE009266EB /* SFNativeRestRequestListener.m */; }; CED452F01D808E0F009266EB /* SalesforceRestAPITests.m in Sources */ = {isa = PBXBuildFile; fileRef = CED452E81D808DEE009266EB /* SalesforceRestAPITests.m */; }; - D378EA3C2D3977AE008FA71D /* SFAPAPIClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = D378EA322D3977AE008FA71D /* SFAPAPIClient.swift */; }; - D378EA3D2D3977AE008FA71D /* SFAPAPIChatGenerationsResponseBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = D378EA312D3977AE008FA71D /* SFAPAPIChatGenerationsResponseBody.swift */; }; - D378EA3E2D3977AE008FA71D /* SFAPAPIErrorResponseBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = D378EA362D3977AE008FA71D /* SFAPAPIErrorResponseBody.swift */; }; - D378EA3F2D3977AE008FA71D /* SFAPAPIError.swift in Sources */ = {isa = PBXBuildFile; fileRef = D378EA352D3977AE008FA71D /* SFAPAPIError.swift */; }; - D378EA402D3977AE008FA71D /* SFAPAPIFeedbackResponseBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = D378EA382D3977AE008FA71D /* SFAPAPIFeedbackResponseBody.swift */; }; - D378EA412D3977AE008FA71D /* SFAPAPIEmbeddingsRequestBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = D378EA332D3977AE008FA71D /* SFAPAPIEmbeddingsRequestBody.swift */; }; - D378EA422D3977AE008FA71D /* SFAPAPIGenerationsRequestBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = D378EA392D3977AE008FA71D /* SFAPAPIGenerationsRequestBody.swift */; }; - D378EA432D3977AE008FA71D /* SFAPAPIGenerationsResponseBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = D378EA3A2D3977AE008FA71D /* SFAPAPIGenerationsResponseBody.swift */; }; - D378EA442D3977AE008FA71D /* SFAPAPIFeedbackRequestBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = D378EA372D3977AE008FA71D /* SFAPAPIFeedbackRequestBody.swift */; }; - D378EA452D3977AE008FA71D /* SFAPAPIChatGenerationsRequestBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = D378EA302D3977AE008FA71D /* SFAPAPIChatGenerationsRequestBody.swift */; }; - D378EA462D3977AE008FA71D /* SFAPAPIEmbeddingsResponseBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = D378EA342D3977AE008FA71D /* SFAPAPIEmbeddingsResponseBody.swift */; }; + D3D675DB2D39EF01008E468E /* ChatGenerationsRequestBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3D675CF2D39EF01008E468E /* ChatGenerationsRequestBody.swift */; }; + D3D675DC2D39EF01008E468E /* EmbeddingsRequestBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3D675D12D39EF01008E468E /* EmbeddingsRequestBody.swift */; }; + D3D675DD2D39EF01008E468E /* ChatGenerationsResponseBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3D675D02D39EF01008E468E /* ChatGenerationsResponseBody.swift */; }; + D3D675DE2D39EF01008E468E /* GenerationsResponseBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3D675D62D39EF01008E468E /* GenerationsResponseBody.swift */; }; + D3D675DF2D39EF01008E468E /* SFapAPIClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3D675D72D39EF01008E468E /* SFapAPIClient.swift */; }; + D3D675E02D39EF01008E468E /* SFapAPIErrorResponseBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3D675D92D39EF01008E468E /* SFapAPIErrorResponseBody.swift */; }; + D3D675E12D39EF01008E468E /* FeedbackResponseBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3D675D42D39EF01008E468E /* FeedbackResponseBody.swift */; }; + D3D675E22D39EF01008E468E /* SFapAPIError.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3D675D82D39EF01008E468E /* SFapAPIError.swift */; }; + D3D675E32D39EF01008E468E /* GenerationsRequestBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3D675D52D39EF01008E468E /* GenerationsRequestBody.swift */; }; + D3D675E42D39EF01008E468E /* FeedbackRequestBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3D675D32D39EF01008E468E /* FeedbackRequestBody.swift */; }; + D3D675E52D39EF01008E468E /* EmbeddingsResponseBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3D675D22D39EF01008E468E /* EmbeddingsResponseBody.swift */; }; E1C80CDF1C5AEBFA001B3A21 /* SFLoginViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C80CDD1C5AEBFA001B3A21 /* SFLoginViewController.h */; settings = {ATTRIBUTES = (Public, ); }; }; E1C80CE01C5AEBFA001B3A21 /* SFLoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E1C80CDE1C5AEBFA001B3A21 /* SFLoginViewController.m */; }; E1C80CEC1C5AEE31001B3A21 /* SFSDKLoginHost.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C80CE11C5AEE31001B3A21 /* SFSDKLoginHost.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -905,17 +905,17 @@ CED452E81D808DEE009266EB /* SalesforceRestAPITests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SalesforceRestAPITests.m; path = SalesforceSDKCoreTests/SalesforceRestAPITests.m; sourceTree = SOURCE_ROOT; }; CED452E91D808DEE009266EB /* SFNativeRestRequestListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SFNativeRestRequestListener.h; path = SalesforceSDKCoreTests/SFNativeRestRequestListener.h; sourceTree = SOURCE_ROOT; }; CED452EA1D808DEE009266EB /* SFNativeRestRequestListener.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SFNativeRestRequestListener.m; path = SalesforceSDKCoreTests/SFNativeRestRequestListener.m; sourceTree = SOURCE_ROOT; }; - D378EA302D3977AE008FA71D /* SFAPAPIChatGenerationsRequestBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFAPAPIChatGenerationsRequestBody.swift; sourceTree = ""; }; - D378EA312D3977AE008FA71D /* SFAPAPIChatGenerationsResponseBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFAPAPIChatGenerationsResponseBody.swift; sourceTree = ""; }; - D378EA322D3977AE008FA71D /* SFAPAPIClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFAPAPIClient.swift; sourceTree = ""; }; - D378EA332D3977AE008FA71D /* SFAPAPIEmbeddingsRequestBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFAPAPIEmbeddingsRequestBody.swift; sourceTree = ""; }; - D378EA342D3977AE008FA71D /* SFAPAPIEmbeddingsResponseBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFAPAPIEmbeddingsResponseBody.swift; sourceTree = ""; }; - D378EA352D3977AE008FA71D /* SFAPAPIError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFAPAPIError.swift; sourceTree = ""; }; - D378EA362D3977AE008FA71D /* SFAPAPIErrorResponseBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFAPAPIErrorResponseBody.swift; sourceTree = ""; }; - D378EA372D3977AE008FA71D /* SFAPAPIFeedbackRequestBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFAPAPIFeedbackRequestBody.swift; sourceTree = ""; }; - D378EA382D3977AE008FA71D /* SFAPAPIFeedbackResponseBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFAPAPIFeedbackResponseBody.swift; sourceTree = ""; }; - D378EA392D3977AE008FA71D /* SFAPAPIGenerationsRequestBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFAPAPIGenerationsRequestBody.swift; sourceTree = ""; }; - D378EA3A2D3977AE008FA71D /* SFAPAPIGenerationsResponseBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFAPAPIGenerationsResponseBody.swift; sourceTree = ""; }; + D3D675CF2D39EF01008E468E /* ChatGenerationsRequestBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatGenerationsRequestBody.swift; sourceTree = ""; }; + D3D675D02D39EF01008E468E /* ChatGenerationsResponseBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatGenerationsResponseBody.swift; sourceTree = ""; }; + D3D675D12D39EF01008E468E /* EmbeddingsRequestBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmbeddingsRequestBody.swift; sourceTree = ""; }; + D3D675D22D39EF01008E468E /* EmbeddingsResponseBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmbeddingsResponseBody.swift; sourceTree = ""; }; + D3D675D32D39EF01008E468E /* FeedbackRequestBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbackRequestBody.swift; sourceTree = ""; }; + D3D675D42D39EF01008E468E /* FeedbackResponseBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbackResponseBody.swift; sourceTree = ""; }; + D3D675D52D39EF01008E468E /* GenerationsRequestBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenerationsRequestBody.swift; sourceTree = ""; }; + D3D675D62D39EF01008E468E /* GenerationsResponseBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenerationsResponseBody.swift; sourceTree = ""; }; + D3D675D72D39EF01008E468E /* SFapAPIClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFapAPIClient.swift; sourceTree = ""; }; + D3D675D82D39EF01008E468E /* SFapAPIError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFapAPIError.swift; sourceTree = ""; }; + D3D675D92D39EF01008E468E /* SFapAPIErrorResponseBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFapAPIErrorResponseBody.swift; sourceTree = ""; }; E1C80CDD1C5AEBFA001B3A21 /* SFLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SFLoginViewController.h; path = Login/SFLoginViewController.h; sourceTree = ""; }; E1C80CDE1C5AEBFA001B3A21 /* SFLoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SFLoginViewController.m; path = Login/SFLoginViewController.m; sourceTree = ""; }; E1C80CE11C5AEE31001B3A21 /* SFSDKLoginHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SFSDKLoginHost.h; path = Login/LoginHost/SFSDKLoginHost.h; sourceTree = ""; }; @@ -1610,7 +1610,7 @@ CED452A81D808D0C009266EB /* RestAPI */ = { isa = PBXGroup; children = ( - D378EA3B2D3977AE008FA71D /* SFAPAPI */, + D3D675DA2D39EF01008E468E /* SfapAPI */, CE7F66291E556CA800DC3FBB /* SFNetwork.h */, CE7F662A1E556CA800DC3FBB /* SFNetwork.m */, CED452B01D808D0C009266EB /* SFRestAPI.h */, @@ -1652,22 +1652,22 @@ path = RestAPI; sourceTree = ""; }; - D378EA3B2D3977AE008FA71D /* SFAPAPI */ = { + D3D675DA2D39EF01008E468E /* SfapAPI */ = { isa = PBXGroup; children = ( - D378EA302D3977AE008FA71D /* SFAPAPIChatGenerationsRequestBody.swift */, - D378EA312D3977AE008FA71D /* SFAPAPIChatGenerationsResponseBody.swift */, - D378EA322D3977AE008FA71D /* SFAPAPIClient.swift */, - D378EA332D3977AE008FA71D /* SFAPAPIEmbeddingsRequestBody.swift */, - D378EA342D3977AE008FA71D /* SFAPAPIEmbeddingsResponseBody.swift */, - D378EA352D3977AE008FA71D /* SFAPAPIError.swift */, - D378EA362D3977AE008FA71D /* SFAPAPIErrorResponseBody.swift */, - D378EA372D3977AE008FA71D /* SFAPAPIFeedbackRequestBody.swift */, - D378EA382D3977AE008FA71D /* SFAPAPIFeedbackResponseBody.swift */, - D378EA392D3977AE008FA71D /* SFAPAPIGenerationsRequestBody.swift */, - D378EA3A2D3977AE008FA71D /* SFAPAPIGenerationsResponseBody.swift */, - ); - path = SFAPAPI; + D3D675CF2D39EF01008E468E /* ChatGenerationsRequestBody.swift */, + D3D675D02D39EF01008E468E /* ChatGenerationsResponseBody.swift */, + D3D675D12D39EF01008E468E /* EmbeddingsRequestBody.swift */, + D3D675D22D39EF01008E468E /* EmbeddingsResponseBody.swift */, + D3D675D32D39EF01008E468E /* FeedbackRequestBody.swift */, + D3D675D42D39EF01008E468E /* FeedbackResponseBody.swift */, + D3D675D52D39EF01008E468E /* GenerationsRequestBody.swift */, + D3D675D62D39EF01008E468E /* GenerationsResponseBody.swift */, + D3D675D72D39EF01008E468E /* SFapAPIClient.swift */, + D3D675D82D39EF01008E468E /* SFapAPIError.swift */, + D3D675D92D39EF01008E468E /* SFapAPIErrorResponseBody.swift */, + ); + path = SfapAPI; sourceTree = ""; }; E139509E1C535F9C00575C03 /* Login */ = { @@ -2222,17 +2222,6 @@ CE675A341E0B2CC6002DBF5A /* SFSDKSoqlBuilder.m in Sources */, 69E2FD9F22FB937F008E0AF0 /* SFSDKEncryptedURLCache.m in Sources */, B7BAD70E1FBAB8AA0046629F /* SFSDKStartURLHandler.m in Sources */, - D378EA3C2D3977AE008FA71D /* SFAPAPIClient.swift in Sources */, - D378EA3D2D3977AE008FA71D /* SFAPAPIChatGenerationsResponseBody.swift in Sources */, - D378EA3E2D3977AE008FA71D /* SFAPAPIErrorResponseBody.swift in Sources */, - D378EA3F2D3977AE008FA71D /* SFAPAPIError.swift in Sources */, - D378EA402D3977AE008FA71D /* SFAPAPIFeedbackResponseBody.swift in Sources */, - D378EA412D3977AE008FA71D /* SFAPAPIEmbeddingsRequestBody.swift in Sources */, - D378EA422D3977AE008FA71D /* SFAPAPIGenerationsRequestBody.swift in Sources */, - D378EA432D3977AE008FA71D /* SFAPAPIGenerationsResponseBody.swift in Sources */, - D378EA442D3977AE008FA71D /* SFAPAPIFeedbackRequestBody.swift in Sources */, - D378EA452D3977AE008FA71D /* SFAPAPIChatGenerationsRequestBody.swift in Sources */, - D378EA462D3977AE008FA71D /* SFAPAPIEmbeddingsResponseBody.swift in Sources */, CE4CE3311C0E523B009F6029 /* SFSDKAppConfig.m in Sources */, CED452C41D808D0C009266EB /* SFRestRequest.m in Sources */, 6900B62D24B64DD800500923 /* NSURLResponse+SFAdditions.m in Sources */, @@ -2241,6 +2230,17 @@ CE4CE3261C0E523B009F6029 /* UIScreen+SFAdditions.m in Sources */, B7C273F01F7EEFB700CE539D /* SFSDKIDPConstants.m in Sources */, B767704D223AE5E400545C90 /* SFRestAPI+Instrumentation.m in Sources */, + D3D675DB2D39EF01008E468E /* ChatGenerationsRequestBody.swift in Sources */, + D3D675DC2D39EF01008E468E /* EmbeddingsRequestBody.swift in Sources */, + D3D675DD2D39EF01008E468E /* ChatGenerationsResponseBody.swift in Sources */, + D3D675DE2D39EF01008E468E /* GenerationsResponseBody.swift in Sources */, + D3D675DF2D39EF01008E468E /* SFapAPIClient.swift in Sources */, + D3D675E02D39EF01008E468E /* SFapAPIErrorResponseBody.swift in Sources */, + D3D675E12D39EF01008E468E /* FeedbackResponseBody.swift in Sources */, + D3D675E22D39EF01008E468E /* SFapAPIError.swift in Sources */, + D3D675E32D39EF01008E468E /* GenerationsRequestBody.swift in Sources */, + D3D675E42D39EF01008E468E /* FeedbackRequestBody.swift in Sources */, + D3D675E52D39EF01008E468E /* EmbeddingsResponseBody.swift in Sources */, 695E86BA29EF8D6E002BDEA6 /* SFSDKIDPAuthCodeLoginRequestCommand.m in Sources */, B7C2745C1F8151E300CE539D /* SFSDKAuthErrorCommand.m in Sources */, CE4CE30A1C0E523B009F6029 /* NSURL+SFAdditions.m in Sources */, diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIChatGenerationsRequestBody.swift b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/ChatGenerationsRequestBody.swift similarity index 97% rename from libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIChatGenerationsRequestBody.swift rename to libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/ChatGenerationsRequestBody.swift index 745a0b2636..e19910ba9e 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIChatGenerationsRequestBody.swift +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/ChatGenerationsRequestBody.swift @@ -1,5 +1,5 @@ /* - SFAPAPIChatGenerationsRequestBody.swift + ChatGenerationsRequestBody.swift SalesforceSDKCore Created by Eric C. Johnson (Johnson.Eric@Salesforce.com) on 20250114. @@ -57,8 +57,8 @@ import Foundation * try super.encode(to: encoder) * } */ -@objc -open class SFAPAPIChatGenerationsRequestBody : NSObject, Codable { +@objc(SFChatGenerationsRequestBody) +open class ChatGenerationsRequestBody : NSObject, Codable { /// The request messages parameter value public let messages: Array diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIChatGenerationsResponseBody.swift b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/ChatGenerationsResponseBody.swift similarity index 97% rename from libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIChatGenerationsResponseBody.swift rename to libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/ChatGenerationsResponseBody.swift index 727ef88534..a32b361353 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIChatGenerationsResponseBody.swift +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/ChatGenerationsResponseBody.swift @@ -1,5 +1,5 @@ /* - SFAPAPIChatGenerationsResponseBody.swift + ChatGenerationsResponseBody.swift SalesforceSDKCore Created by Eric C. Johnson (Johnson.Eric@Salesforce.com) on 20250114. @@ -32,8 +32,8 @@ import Foundation /** * Models a `sfap_api` "chat-generations" endpoint response. */ -@objc -public class SFAPAPIChatGenerationsResponseBody : NSObject, Codable { +@objc(SFChatGenerationsResponseBody) +public class ChatGenerationsResponseBody : NSObject, Codable { public let id: String? public let generationDetails: GenerationDetails? diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIEmbeddingsRequestBody.swift b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/EmbeddingsRequestBody.swift similarity index 94% rename from libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIEmbeddingsRequestBody.swift rename to libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/EmbeddingsRequestBody.swift index 5cddc7881a..04fd4e7c52 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIEmbeddingsRequestBody.swift +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/EmbeddingsRequestBody.swift @@ -1,5 +1,5 @@ /* - SFAPAPIEmbeddingsRequestBody.swift + EmbeddingsRequestBody.swift SalesforceSDKCore Created by Eric C. Johnson (Johnson.Eric@Salesforce.com) on 20250114. @@ -33,8 +33,8 @@ import Foundation * Models a `sfap_api` `embeddings` endpoint request. * See https://developer.salesforce.com/docs/einstein/genai/references/models-api?meta=generateText */ -@objc -public class SFAPAPIEmbeddingsRequestBody : NSObject, Codable { +@objc(SFEmbeddingsRequestBody) +public class EmbeddingsRequestBody : NSObject, Codable { public let input: Array public init(input: Array) { diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIEmbeddingsResponseBody.swift b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/EmbeddingsResponseBody.swift similarity index 95% rename from libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIEmbeddingsResponseBody.swift rename to libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/EmbeddingsResponseBody.swift index c6285edf81..a9372ce02c 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIEmbeddingsResponseBody.swift +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/EmbeddingsResponseBody.swift @@ -1,5 +1,5 @@ /* - SFAPAPIEmbeddingsResponseBody.swift + EmbeddingsResponseBody.swift SalesforceSDKCore Created by Eric C. Johnson (Johnson.Eric@Salesforce.com) on 20250114. @@ -32,8 +32,8 @@ import Foundation /** * Models a `sfap_api` `embeddings` endpoint response. */ -@objc -public class SFAPAPIEmbeddingsResponseBody : NSObject, Codable { +@objc(SFEmbeddingsResponseBody) +public class EmbeddingsResponseBody : NSObject, Codable { public let embeddings: Array? public let parameters: Parameters? diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIFeedbackRequestBody.swift b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/FeedbackRequestBody.swift similarity index 97% rename from libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIFeedbackRequestBody.swift rename to libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/FeedbackRequestBody.swift index c3d2b025ac..4fbb1c8335 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIFeedbackRequestBody.swift +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/FeedbackRequestBody.swift @@ -1,5 +1,5 @@ /* - SFAPAPIFeedbackRequestBody.swift + FeedbackRequestBody.swift SalesforceSDKCore Created by Eric C. Johnson (Johnson.Eric@Salesforce.com) on 20250114. @@ -57,8 +57,8 @@ import Foundation * try super.encode(to: encoder) * } */ -@objc -public class SFAPAPIFeedbackRequestBody : NSObject, Codable { +@objc(SFFeedbackRequestBody) +public class FeedbackRequestBody : NSObject, Codable { public let id: String? public let appGeneration: String? public let appGenerationId: String? diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIFeedbackResponseBody.swift b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/FeedbackResponseBody.swift similarity index 94% rename from libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIFeedbackResponseBody.swift rename to libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/FeedbackResponseBody.swift index f24533f14a..d9f0575fe2 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIFeedbackResponseBody.swift +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/FeedbackResponseBody.swift @@ -1,5 +1,5 @@ /* - SFAPAPIFeedbackResponseBody.swift + FeedbackResponseBody.swift SalesforceSDKCore Created by Eric C. Johnson (Johnson.Eric@Salesforce.com) on 20250114. @@ -32,8 +32,8 @@ import Foundation /** * Models a `sfap_api` `feedback` endpoint response. */ -@objc -public class SFAPAPIFeedbackResponseBody : NSObject, Codable { +@objc(SFFeedbackResponseBody) +public class FeedbackResponseBody : NSObject, Codable { public let message: String? /** The original JSON used to initialize this response body */ diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIGenerationsRequestBody.swift b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/GenerationsRequestBody.swift similarity index 91% rename from libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIGenerationsRequestBody.swift rename to libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/GenerationsRequestBody.swift index 4617d016e8..3f7dd50453 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIGenerationsRequestBody.swift +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/GenerationsRequestBody.swift @@ -1,5 +1,5 @@ /* - SFAPAPIGenerationsRequestBody.swift + GenerationsRequestBody.swift SalesforceSDKCore Created by Eric C. Johnson (Johnson.Eric@Salesforce.com) on 20250108. @@ -33,8 +33,13 @@ import Foundation Models a `sfap_api` `generations` endpoint request. See https://developer.salesforce.com/docs/einstein/genai/references/models-api?meta=generateText */ -struct SFAPAPIGenerationsRequestBody: Codable { +@objc(SFGenerationsRequestBody) +class GenerationsRequestBody: NSObject, Codable { /// The request prompt parameter value public let prompt: String + + public init(prompt: String) { + self.prompt = prompt + } } diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIGenerationsResponseBody.swift b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/GenerationsResponseBody.swift similarity index 97% rename from libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIGenerationsResponseBody.swift rename to libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/GenerationsResponseBody.swift index c212f53e12..fadcd0d249 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIGenerationsResponseBody.swift +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/GenerationsResponseBody.swift @@ -1,5 +1,5 @@ /* - SFAPAPIGenerationsResponseBody.swift + GenerationsResponseBody.swift SalesforceSDKCore Created by Eric C. Johnson (Johnson.Eric@Salesforce.com) on 20250108. @@ -33,8 +33,8 @@ import Foundation * Models a `sfap_api` "generations" endpoint response. * See https://developer.salesforce.com/docs/einstein/genai/references/models-api?meta=generateText */ -@objc -public class SFAPAPIGenerationsResponseBody: NSObject, Codable { +@objc(SFGenerationsResponseBody) +public class GenerationsResponseBody: NSObject, Codable { public let id: String? public let generation: Generation? public let moreGenerations: String? diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIClient.swift b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SfapAPI/SFapAPIClient.swift similarity index 93% rename from libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIClient.swift rename to libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SfapAPI/SFapAPIClient.swift index 7f27bf687f..c6ceb34a68 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIClient.swift +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SfapAPI/SFapAPIClient.swift @@ -1,5 +1,5 @@ /* - SFAPAPIClient.swift + SFapAPIClient.swift SalesforceSDKCore Created by Eric C. Johnson (Johnson.Eric@Salesforce.com) on 20250108. @@ -38,8 +38,8 @@ import Foundation * * See https://developer.salesforce.com/docs/einstein/genai/guide/access-models-api-with-rest.html */ -@objc(SFAPAPIClient) -public class SFAPAPIClient : NSObject { +@objc(SFapAPIClient) +public class SFapAPIClient : NSObject { /// The sfap_api hostname private let apiHostName: String @@ -80,8 +80,8 @@ public class SFAPAPIClient : NSObject { */ @objc public func fetchGeneratedEmbeddings( - requestBody: SFAPAPIEmbeddingsRequestBody - ) async throws -> SFAPAPIEmbeddingsResponseBody { + requestBody: EmbeddingsRequestBody + ) async throws -> EmbeddingsResponseBody { // Guards. guard let modelName = modelName else { @@ -114,7 +114,7 @@ public class SFAPAPIClient : NSObject { case .success(let sfapApiEmbeddingsResponse): // Decode the sfap_api embeddings response. let sfapApiEmbeddingsResponseBody = try sfapApiEmbeddingsResponse.asDecodable( - type: SFAPAPIEmbeddingsResponseBody.self + type: EmbeddingsResponseBody.self ) sfapApiEmbeddingsResponseBody.sourceJson = sfapApiEmbeddingsResponse.asString() return sfapApiEmbeddingsResponseBody @@ -132,8 +132,8 @@ public class SFAPAPIClient : NSObject { */ @objc public func fetchGeneratedChat( - requestBody: SFAPAPIChatGenerationsRequestBody - ) async throws -> SFAPAPIChatGenerationsResponseBody { + requestBody: ChatGenerationsRequestBody + ) async throws -> ChatGenerationsResponseBody { // Guards. guard let modelName = modelName else { @@ -166,7 +166,7 @@ public class SFAPAPIClient : NSObject { case .success(let sfapApiChatGenerationsResponse): // Decode the sfap_api chat generations response. let sfapApiChatGenerationsResponseBody = try sfapApiChatGenerationsResponse.asDecodable( - type: SFAPAPIChatGenerationsResponseBody.self + type: ChatGenerationsResponseBody.self ) sfapApiChatGenerationsResponseBody.sourceJson = sfapApiChatGenerationsResponse.asString() return sfapApiChatGenerationsResponseBody @@ -185,7 +185,7 @@ public class SFAPAPIClient : NSObject { @objc public func fetchGeneratedText( _ prompt: String - ) async throws -> SFAPAPIGenerationsResponseBody { + ) async throws -> GenerationsResponseBody { // Guards. guard let modelName = modelName else { @@ -194,7 +194,7 @@ public class SFAPAPIClient : NSObject { // Generate the sfap_api generations request body. let sfapApiGenerationsRequestBodyString = try requestBodyStringFromRequest( - SFAPAPIGenerationsRequestBody(prompt: prompt), + GenerationsRequestBody(prompt: prompt), named: "generations request") // Create the sfap_api generations request. @@ -218,7 +218,7 @@ public class SFAPAPIClient : NSObject { case .success(let sfapApiGenerationsResponse): // Decode the sfap_api generations response. let sfapApiGenerationsResponseBody = try sfapApiGenerationsResponse.asDecodable( - type: SFAPAPIGenerationsResponseBody.self + type: GenerationsResponseBody.self ) sfapApiGenerationsResponseBody.sourceJson = sfapApiGenerationsResponse.asString() return sfapApiGenerationsResponseBody @@ -237,8 +237,8 @@ public class SFAPAPIClient : NSObject { */ @objc public func submitGeneratedTextFeedback( - requestBody: SFAPAPIFeedbackRequestBody - ) async throws -> SFAPAPIFeedbackResponseBody { + requestBody: FeedbackRequestBody + ) async throws -> FeedbackResponseBody { // Generate the sfap_api feedback request body. let sfapApiFeedbackRequestBodyString = try requestBodyStringFromRequest( @@ -266,7 +266,7 @@ public class SFAPAPIClient : NSObject { case .success(let sfapApiFeedbackResponse): // Decode the sfap_api feedback response. let sfapApiFeedbackResponseBody = try sfapApiFeedbackResponse.asDecodable( - type: SFAPAPIFeedbackResponseBody.self + type: FeedbackResponseBody.self ) sfapApiFeedbackResponseBody.sourceJson = sfapApiFeedbackResponse.asString() return sfapApiFeedbackResponseBody @@ -326,7 +326,7 @@ public class SFAPAPIClient : NSObject { underlyingError: _, urlResponse: _ ): if let errorResponseData = response as? Data { - let sfapApiErrorResponseBody = try JSONDecoder().decode(SFAPAPIErrorResponseBody.self, from: errorResponseData) + let sfapApiErrorResponseBody = try JSONDecoder().decode(SFapAPIErrorResponseBody.self, from: errorResponseData) return sfapApiError( errorCode: sfapApiErrorResponseBody.errorCode, message: "sfap_api \(requestName) failure with description: '\(restClientError.localizedDescription)', message: '\(String(describing: sfapApiErrorResponseBody.message))'.", @@ -342,11 +342,11 @@ public class SFAPAPIClient : NSObject { errorCode: String? = nil, message: String, messageCode: String? = nil, - source: String? = nil) -> SFAPAPIError + source: String? = nil) -> SFapAPIError { SFSDKCoreLogger().e(classForCoder, message: message) - return SFAPAPIError( + return SFapAPIError( errorCode: errorCode, message: message, messageCode: messageCode, diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIError.swift b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SfapAPI/SFapAPIError.swift similarity index 97% rename from libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIError.swift rename to libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SfapAPI/SFapAPIError.swift index be53cb30b4..8ab754a437 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIError.swift +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SfapAPI/SFapAPIError.swift @@ -1,5 +1,5 @@ /* - SFAPAPIError.swift + SFapAPIError.swift SalesforceSDKCore Created by Eric C. Johnson (Johnson.Eric@Salesforce.com) on 20250109. @@ -31,7 +31,7 @@ import Foundation /// An error derived from an `sfap_api` endpoint failure response. /// See https://developer.salesforce.com/docs/einstein/genai/guide/access-models-api-with-rest.html#step-3-use-models-rest-api -public struct SFAPAPIError: Error { +public struct SFapAPIError: Error { /// The `sfap_api` error code public var errorCode: String? = nil diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIErrorResponseBody.swift b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SfapAPI/SFapAPIErrorResponseBody.swift similarity index 96% rename from libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIErrorResponseBody.swift rename to libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SfapAPI/SFapAPIErrorResponseBody.swift index 57498468de..6643381310 100644 --- a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFAPAPI/SFAPAPIErrorResponseBody.swift +++ b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SfapAPI/SFapAPIErrorResponseBody.swift @@ -1,5 +1,5 @@ /* - SFAPAPIErrorResponseBody.swift + SFapAPIErrorResponseBody.swift SalesforceSDKCore Created by Eric C. Johnson (Johnson.Eric@Salesforce.com) on 20250114. @@ -33,7 +33,7 @@ import Foundation Models error responses from the `sfap_api` endpoints. See https://developer.salesforce.com/docs/einstein/genai/references/models-api?meta=Summary */ -public struct SFAPAPIErrorResponseBody: Codable { +public struct SFapAPIErrorResponseBody: Codable { /// The response error code public let errorCode: String?