Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix few bugs related to AI APIs #12643

Merged
merged 9 commits into from
Oct 15, 2024
Merged

Fix few bugs related to AI APIs #12643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ad31248
Remove transitive commons-io version
AnuGayan Oct 7, 2024
d313ed3
Merge branch 'master' of https://github.com/wso2/carbon-apimgt into m…
AnuGayan Oct 7, 2024
0c73740
Bug fixes related to AI APIs
AnuGayan Oct 7, 2024
1961d28
Merge branch 'master' of https://github.com/wso2/carbon-apimgt into m…
AnuGayan Oct 7, 2024
c25a77e
Fix issue in subscription update approval workflow
AnuGayan Oct 8, 2024
291cd1e
Merge branch 'master' of https://github.com/wso2/carbon-apimgt into m…
AnuGayan Oct 8, 2024
f86483d
Fix issue in subscription update approval workflow
AnuGayan Oct 8, 2024
3fdc01e
Merge branch 'master' of https://github.com/wso2/carbon-apimgt into m…
AnuGayan Oct 10, 2024
376af0d
Merge branch 'wso2:master' into master
AnuGayan Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/BuiltInLLMProviderService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public Map<String, String> getResponseMetadata(String payload, Map<String, Strin
throws APIManagementException {

if (metadataList == null || metadataList.isEmpty()) {
log.warn("Metadata list is null or empty.");
log.debug("Metadata list is null or empty.");
return metadataMap;
}
try {
Expand All @@ -56,13 +56,13 @@ public Map<String, String> getResponseMetadata(String payload, Map<String, Strin
String extractedValue = JsonPath.read(payload, attributeIdentifier).toString();
metadataMap.put(attributeName, extractedValue);
} catch (PathNotFoundException e) {
log.warn("Attribute not found in the payload for identifier: " + attributeIdentifier);
log.debug("Attribute not found in the payload for identifier: " + attributeIdentifier);
}
} else {
log.warn("Payload is null, cannot extract metadata for attribute: " + attributeName);
log.debug("Payload is null, cannot extract metadata for attribute: " + attributeName);
}
} else {
log.warn("Unsupported input source: " + inputSource + " for attribute: " + attributeName);
log.debug("Unsupported input source: " + inputSource + " for attribute: " + attributeName);
}
}
} catch (PathNotFoundException e) {
Expand Down
11 changes: 5 additions & 6 deletions .../java/org/wso2/carbon/apimgt/gateway/handlers/analytics/SynapseAnalyticsDataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,10 +448,8 @@ public static int getHourByUTC(long timestampMillis) {
return offsetDateTime.getHour();
}

private void getAiAnalyticsData(
Map aiApiResponseMetadata,
int requestStartHour,
Map<String, Object> customProperties
private void getAiAnalyticsData(Map aiApiResponseMetadata, int requestStartHour,
Map<String, Object> customProperties
) {
Map<String, String> aiMetadata = new HashMap<>();
Map<String, Integer> aiTokenUsage = new HashMap<>();
Expand Down Expand Up @@ -608,7 +606,8 @@ public int getResponseSize() {
buildResponseMessage = false;
}
}
Map headers = (Map) messageContext.getProperty(TRANSPORT_HEADERS);
Map headers = (Map) ((Axis2MessageContext) messageContext).getAxis2MessageContext()
.getProperty(TRANSPORT_HEADERS);
if (headers != null && headers.get(HttpHeaders.CONTENT_LENGTH) != null) {
responseSize = Integer.parseInt(headers.get(HttpHeaders.CONTENT_LENGTH).toString());
}
Expand Down Expand Up @@ -637,7 +636,7 @@ public int getResponseSize() {
}

public String getResponseContentType() {
Map headers = (Map) messageContext.getProperty(TRANSPORT_HEADERS);
Map headers = (Map) ((Axis2MessageContext) messageContext).getAxis2MessageContext().getProperty(TRANSPORT_HEADERS);
if (headers != null && headers.get(HttpHeaders.CONTENT_TYPE) != null) {
return headers.get(HttpHeaders.CONTENT_TYPE).toString();
}
Expand Down
Loading
Loading