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.

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

Sync master branch #12707

Merged
merged 658 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
658 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
2db9154
Fix null pointer error when extracting AI data
nimsara66 Oct 7, 2024
48bc083
Add DefaultSubscriptionless policy to AI APIs
Avishka-Shamendra Oct 7, 2024
dc9d085
Fix subscription policy filter logic
Avishka-Shamendra Oct 7, 2024
4383c61
Improve developer comment
Avishka-Shamendra Oct 7, 2024
a321d4e
Merge pull request #12635 from tharikaGitHub/4.4.0-release
tharikaGitHub Oct 7, 2024
39a3cf9
Merge pull request #12638 from dakshina99/get_all_keymanagers
RakhithaRR Oct 7, 2024
a18f162
[WSO2 Release] [Jenkins #7271] [Release 9.30.33] prepare release v9.3…
wso2-jenkins-bot Oct 7, 2024
a52169b
[WSO2 Release] [Jenkins #7271] [Release 9.30.33] prepare for next dev…
wso2-jenkins-bot Oct 7, 2024
ca62007
Merge pull request #12639 from nimsara66/3194
RakhithaRR Oct 7, 2024
826ac5f
[WSO2 Release] [Jenkins #7273] [Release 9.30.34] prepare release v9.3…
wso2-jenkins-bot Oct 7, 2024
2e7dc49
[WSO2 Release] [Jenkins #7273] [Release 9.30.34] prepare for next dev…
wso2-jenkins-bot 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
2c1fbda
Upgrade analytics event publisher client to 1.2.20
HeshanSudarshana Oct 8, 2024
591719a
Fixing CC runtime artifacts retrieval issue and GW timeout issue duri…
HiranyaKavishani Oct 8, 2024
6e7656d
[WSO2 Release] [Jenkins #7275] [Release 9.30.35] prepare release v9.3…
wso2-jenkins-bot Oct 8, 2024
c4237e6
[WSO2 Release] [Jenkins #7275] [Release 9.30.35] prepare for next dev…
wso2-jenkins-bot Oct 8, 2024
4991d8c
Merge pull request #12644 from HeshanSudarshana/master-upgrade-analyt…
HeshanSudarshana Oct 8, 2024
9e08657
Merge pull request #12641 from Avishka-Shamendra/issue-3184
Avishka-Shamendra Oct 8, 2024
93ed4e6
Fix authentication flow for optional - optional scenario
sgayangi Jul 25, 2024
dab7e94
Eliminate the use of CONCAT in the get block condition query
ashanhr Oct 8, 2024
b68cbaa
Improve error handling in LLM Provider Events
PasanT9 Oct 8, 2024
6af27f7
[WSO2 Release] [Jenkins #7278] [Release 9.30.36] prepare release v9.3…
wso2-jenkins-bot Oct 8, 2024
8ee2a7f
[WSO2 Release] [Jenkins #7278] [Release 9.30.36] prepare for next dev…
wso2-jenkins-bot Oct 8, 2024
82dbd60
Handle null api definitions
PasanT9 Oct 8, 2024
5b95130
Fix file references in api definition
PasanT9 Oct 8, 2024
08e2231
Add AiConfiguration.Enabled config
PasanT9 Oct 8, 2024
76788fb
Merge pull request #12649 from PasanT9/file-ref
PasanT9 Oct 8, 2024
f223d53
[WSO2 Release] [Jenkins #7280] [Release 9.30.37] prepare release v9.3…
wso2-jenkins-bot Oct 8, 2024
322f775
[WSO2 Release] [Jenkins #7280] [Release 9.30.37] prepare for next dev…
wso2-jenkins-bot Oct 8, 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
47e3c46
Merge pull request #12648 from PasanT9/null-llm
PasanT9 Oct 8, 2024
f86483d
Fix issue in subscription update approval workflow
AnuGayan Oct 8, 2024
0cea13f
[WSO2 Release] [Jenkins #7282] [Release 9.30.38] prepare release v9.3…
wso2-jenkins-bot Oct 8, 2024
35bd0e9
[WSO2 Release] [Jenkins #7282] [Release 9.30.38] prepare for next dev…
wso2-jenkins-bot Oct 8, 2024
6748714
Fix issues in getting per API logging levels
RakhithaRR Oct 8, 2024
c2f0028
Merge pull request #12647 from PasanT9/ai-config
PasanT9 Oct 9, 2024
0f9c8d8
[WSO2 Release] [Jenkins #7284] [Release 9.30.39] prepare release v9.3…
wso2-jenkins-bot Oct 9, 2024
7166ff9
[WSO2 Release] [Jenkins #7284] [Release 9.30.39] prepare for next dev…
wso2-jenkins-bot Oct 9, 2024
a2fabcc
Merge pull request #12501 from sgayangi/sgayangi-optional-optional-fix
sgayangi Oct 9, 2024
87badc3
[WSO2 Release] [Jenkins #7286] [Release 9.30.40] prepare release v9.3…
wso2-jenkins-bot Oct 9, 2024
b2ba4a9
[WSO2 Release] [Jenkins #7286] [Release 9.30.40] prepare for next dev…
wso2-jenkins-bot Oct 9, 2024
bbaa2a8
Merge pull request #12650 from RakhithaRR/logging-fix
RakhithaRR Oct 9, 2024
3a1fa1d
Bump swagger-parser version to 2.1.22.wso2v2
YasasRangika Oct 9, 2024
d15102b
[WSO2 Release] [Jenkins #7288] [Release 9.30.41] prepare release v9.3…
wso2-jenkins-bot Oct 9, 2024
652ab60
[WSO2 Release] [Jenkins #7288] [Release 9.30.41] prepare for next dev…
wso2-jenkins-bot Oct 9, 2024
d43cd60
Add API Key mediator
PasanT9 Oct 3, 2024
9ec4ff1
Remove storing redundant AI endpoint configurations
PasanT9 Oct 4, 2024
fe33823
Add missing WSO2 license headers
PasanT9 Oct 4, 2024
51133d8
Add apiKeyIdentifierType config
PasanT9 Oct 9, 2024
7caa5f6
Add backendThrottlingConfiguration class
SavinduDimal Oct 7, 2024
15d0e81
Add default AI subscription policies
SavinduDimal Oct 9, 2024
91a1464
Fix unit tests
SavinduDimal Oct 9, 2024
641df8b
Add apiKeyIdentifierType config
PasanT9 Oct 9, 2024
d21ce73
Merge pull request #12628 from PasanT9/api-key-mediator
PasanT9 Oct 10, 2024
a112f26
[WSO2 Release] [Jenkins #7290] [Release 9.30.42] prepare release v9.3…
wso2-jenkins-bot Oct 10, 2024
60991fb
[WSO2 Release] [Jenkins #7290] [Release 9.30.42] prepare for next dev…
wso2-jenkins-bot Oct 10, 2024
db7b26c
Add notification event for tenant Resident KM creation
RakhithaRR Oct 10, 2024
3fdc01e
Merge branch 'master' of https://github.com/wso2/carbon-apimgt into m…
AnuGayan Oct 10, 2024
c877918
Merge pull request #12646 from ashanhr/master
RakhithaRR Oct 11, 2024
f178ce7
Merge pull request #12651 from YasasRangika/swagger-upgrade
RakhithaRR Oct 11, 2024
fa36bf3
Add changes for https://github.com/wso2/api-manager/issues/3044
YasasRangika Sep 5, 2024
58fb56f
Fix unit test failures
YasasRangika Sep 6, 2024
0a58db8
[WSO2 Release] [Jenkins #7292] [Release 9.30.43] prepare release v9.3…
wso2-jenkins-bot Oct 11, 2024
81fe482
[WSO2 Release] [Jenkins #7292] [Release 9.30.43] prepare for next dev…
wso2-jenkins-bot Oct 11, 2024
76cc333
Merge pull request #12654 from RakhithaRR/tenant-rkm-notify
RakhithaRR Oct 11, 2024
bf747b6
Merge commit '81fe48292ade338fbf2d6e8d7b229ae603902019' into cb043c54…
wso2-jenkins-bot Oct 11, 2024
906cd49
[WSO2 Release] [Jenkins #7294] [Release 9.30.44] prepare release v9.3…
wso2-jenkins-bot Oct 11, 2024
53ad6db
[WSO2 Release] [Jenkins #7294] [Release 9.30.44] prepare for next dev…
wso2-jenkins-bot Oct 11, 2024
e5817e5
Fix export flow to detect thumbnail changes from the current API/API …
ashera96 Oct 11, 2024
66db498
Merge pull request #12656 from ashera96/master
RakhithaRR Oct 12, 2024
068ee27
[WSO2 Release] [Jenkins #7296] [Release 9.30.45] prepare release v9.3…
wso2-jenkins-bot Oct 12, 2024
5ecdf9d
[WSO2 Release] [Jenkins #7296] [Release 9.30.45] prepare for next dev…
wso2-jenkins-bot Oct 12, 2024
72ed80a
Populate `UserInfo Endpoint` in `keyManagerWellKnownResponseDTO`
nimsara66 Oct 13, 2024
558cd0e
Add nextAccess timestamp to synapse context on burst control throttled
nisan-abeywickrama Oct 13, 2024
0f11d8b
Remove subscription burst control throttle test
nisan-abeywickrama Oct 13, 2024
aad71fc
Implement API Health Check Endpoints for traffic ports and avoid anal…
dakshina99 Oct 14, 2024
376af0d
Merge branch 'wso2:master' into master
AnuGayan Oct 14, 2024
c1e32de
Merge pull request #12661 from dakshina99/health_check_endpoints
RakhithaRR Oct 14, 2024
086dd25
[WSO2 Release] [Jenkins #7298] [Release 9.30.46] prepare release v9.3…
wso2-jenkins-bot Oct 14, 2024
a11f54b
[WSO2 Release] [Jenkins #7298] [Release 9.30.46] prepare for next dev…
wso2-jenkins-bot Oct 14, 2024
822574c
Upgrade graphQL version
YasasRangika Oct 14, 2024
08424cb
Start tenant flow before creating tenant context
RakhithaRR Oct 14, 2024
7f2777b
Fix issue: token based throttling can not be removed
SavinduDimal Oct 14, 2024
f78c652
Merge pull request #12643 from AnuGayan/master
RakhithaRR Oct 15, 2024
164444e
[WSO2 Release] [Jenkins #7300] [Release 9.30.47] prepare release v9.3…
wso2-jenkins-bot Oct 15, 2024
8d6f8a7
[WSO2 Release] [Jenkins #7300] [Release 9.30.47] prepare for next dev…
wso2-jenkins-bot Oct 15, 2024
5218aa2
Fix API Product export error due to thumbnail not found error
ashera96 Oct 15, 2024
0c71612
Merge commit '8d6f8a7e1327278674c69dcf1396078df11e6d47' into 9e3e4f49…
wso2-jenkins-bot Oct 15, 2024
d75cb4e
[WSO2 Release] [Jenkins #7301] [Release 9.30.48] prepare release v9.3…
wso2-jenkins-bot Oct 15, 2024
c59caba
[WSO2 Release] [Jenkins #7301] [Release 9.30.48] prepare for next dev…
wso2-jenkins-bot Oct 15, 2024
a9ba505
Fix websocket new version creation
Avishka-Shamendra Oct 15, 2024
bf68c9f
Fix throttle policy reset for tenants
Avishka-Shamendra Oct 15, 2024
a1aeee4
Merge pull request #12666 from ashera96/master
RakhithaRR Oct 15, 2024
cb5efa2
Add config change for the broker connect timeout and upgrade the ande…
dakshina99 Oct 15, 2024
e042b8a
[WSO2 Release] [Jenkins #7303] [Release 9.30.49] prepare release v9.3…
wso2-jenkins-bot Oct 15, 2024
9cdb278
[WSO2 Release] [Jenkins #7303] [Release 9.30.49] prepare for next dev…
wso2-jenkins-bot Oct 15, 2024
fa699dc
Replaced internal hashing algorithm to sha256
AnuGayan Oct 15, 2024
0f355e4
Merge pull request #12665 from RakhithaRR/tenant-flow
RakhithaRR Oct 15, 2024
0c4520a
[WSO2 Release] [Jenkins #7304] [Release 9.30.50] prepare release v9.3…
wso2-jenkins-bot Oct 15, 2024
e48a9ff
[WSO2 Release] [Jenkins #7304] [Release 9.30.50] prepare for next dev…
wso2-jenkins-bot Oct 15, 2024
baf19f2
Bump kernel and other component versions
RakhithaRR Oct 15, 2024
a5c51fa
Update tables to increase hashing column lengths
AnuGayan Oct 15, 2024
8260a49
Merge pull request #12671 from RakhithaRR/kernel-beta
RakhithaRR Oct 15, 2024
43e7ffc
Merge pull request #12663 from YasasRangika/graphQL-upgrade
RakhithaRR Oct 15, 2024
332e0d5
[WSO2 Release] [Jenkins #7306] [Release 9.30.51] prepare release v9.3…
wso2-jenkins-bot Oct 15, 2024
99f2e3e
[WSO2 Release] [Jenkins #7306] [Release 9.30.51] prepare for next dev…
wso2-jenkins-bot Oct 15, 2024
c5f78b4
Minor improvements to the methods and validation
AnuGayan Oct 15, 2024
654ffa4
Merge pull request #12667 from Avishka-Shamendra/bug-fixing
Avishka-Shamendra Oct 16, 2024
7b08518
Minor improvements to the methods and validation
AnuGayan Oct 16, 2024
cfac1e9
Make sha256 the default hashing algorithm
AnuGayan Oct 16, 2024
6c30016
[WSO2 Release] [Jenkins #7308] [Release 9.30.52] prepare release v9.3…
wso2-jenkins-bot Oct 16, 2024
b82d665
[WSO2 Release] [Jenkins #7308] [Release 9.30.52] prepare for next dev…
wso2-jenkins-bot Oct 16, 2024
c67513a
Merge branch 'master' into tm_thread_blocking_config
dakshina99 Oct 16, 2024
a865212
Merge pull request #12669 from dakshina99/tm_thread_blocking_config
RakhithaRR Oct 16, 2024
98f285a
Merge commit 'b82d665e424361f917ddcb20a9ec1927cc18613d' into 2cae92db…
wso2-jenkins-bot Oct 16, 2024
a50c286
Merge pull request #12668 from Avishka-Shamendra/bug-fixing-2
Avishka-Shamendra Oct 16, 2024
168be1d
[WSO2 Release] [Jenkins #7309] [Release 9.30.53] prepare release v9.3…
wso2-jenkins-bot Oct 16, 2024
29fe770
[WSO2 Release] [Jenkins #7309] [Release 9.30.53] prepare for next dev…
wso2-jenkins-bot Oct 16, 2024
74e353c
Fix application retrieval not working as expected when searched based…
ashera96 Oct 16, 2024
209f636
Make sha256 the default hashing algorithm
AnuGayan Oct 16, 2024
2788b04
Make sha256 the default hashing algorithm
AnuGayan Oct 17, 2024
9be03b4
Make sha256 the default hashing algorithm
AnuGayan Oct 17, 2024
d9ca6e2
Merge pull request #12674 from ashera96/master
RakhithaRR Oct 17, 2024
01873c4
[WSO2 Release] [Jenkins #7311] [Release 9.30.54] prepare release v9.3…
wso2-jenkins-bot Oct 17, 2024
2c9c644
[WSO2 Release] [Jenkins #7311] [Release 9.30.54] prepare for next dev…
wso2-jenkins-bot Oct 17, 2024
7e684fc
Merge pull request #12672 from AnuGayan/master-AI-API-temp
AnuGayan Oct 17, 2024
98abc4a
Change sha256 to SHA-256
AnuGayan Oct 17, 2024
8639ef6
Merge pull request #12677 from AnuGayan/master-AI-API-temp
AnuGayan Oct 17, 2024
6a8430c
[WSO2 Release] [Jenkins #7314] [Release 9.30.55] prepare release v9.3…
wso2-jenkins-bot Oct 17, 2024
6405d78
[WSO2 Release] [Jenkins #7314] [Release 9.30.55] prepare for next dev…
wso2-jenkins-bot Oct 17, 2024
22668de
Merge pull request #12659 from nimsara66/3121-pr
RakhithaRR Oct 18, 2024
b660477
add counter improvements
Tharanidk Sep 29, 2024
0303fff
[WSO2 Release] [Jenkins #7316] [Release 9.30.56] prepare release v9.3…
wso2-jenkins-bot Oct 18, 2024
495ebdb
[WSO2 Release] [Jenkins #7316] [Release 9.30.56] prepare for next dev…
wso2-jenkins-bot Oct 18, 2024
70e7157
hide the 'Usage report' when the transaction counter is disabled
Tharanidk Oct 18, 2024
cd9602f
Bump synapse version
RakhithaRR Oct 18, 2024
a537572
fix review changes
Tharanidk Oct 18, 2024
c9ca886
Merge pull request #12680 from RakhithaRR/synapse-bump
RakhithaRR Oct 18, 2024
8184684
[WSO2 Release] [Jenkins #7318] [Release 9.30.57] prepare release v9.3…
wso2-jenkins-bot Oct 18, 2024
ee9737d
[WSO2 Release] [Jenkins #7318] [Release 9.30.57] prepare for next dev…
wso2-jenkins-bot Oct 18, 2024
eb03cef
Merge pull request #12611 from Tharanidk/counter_improve
Tharanidk Oct 18, 2024
7e1f0ca
Remove organization from LLMProvider
PasanT9 Oct 15, 2024
f3d0cf1
Refactor registerLLMProvider
PasanT9 Oct 15, 2024
604bbb8
Refactor DB scripts for LLM Providers
PasanT9 Oct 15, 2024
3c6a6e0
Remove llmProviderId
PasanT9 Oct 15, 2024
13d82f6
Decouple AIConfiguration and Subtype
PasanT9 Oct 15, 2024
aef10b2
Introduce subtypeConfigurations
PasanT9 Oct 16, 2024
e6fc355
Reject bad requests
PasanT9 Oct 17, 2024
26dcf59
Fix sample curl requests relates to AI APIs
PasanT9 Oct 17, 2024
1953361
Remove unnecessary null checks
PasanT9 Oct 17, 2024
3f9faa2
Fix sample curl requests
PasanT9 Oct 17, 2024
4a34e6f
Refactor internal rest APIs
PasanT9 Oct 17, 2024
1131e28
Remove organization from LLMProvider
PasanT9 Oct 17, 2024
c422c00
Isolate LLMProvider using organization
PasanT9 Oct 17, 2024
fe7cb31
Refactor internal REST APIs
PasanT9 Oct 17, 2024
308a72d
Revert aateway AI config retrieval scripts
PasanT9 Oct 17, 2024
a6bd3ad
Refactor AI API Gateway implementation
PasanT9 Oct 18, 2024
dffdec7
Handle xWSO2Tenant ALL scenario
PasanT9 Oct 18, 2024
a6d08ce
Fix null payload error
PasanT9 Oct 18, 2024
c8868ea
Refactor AIAPI gateway deployment flow
nimsara66 Oct 18, 2024
e92d20b
Add null checks
PasanT9 Oct 18, 2024
3e8c72b
[WSO2 Release] [Jenkins #7320] [Release 9.30.58] prepare release v9.3…
wso2-jenkins-bot Oct 18, 2024
7a358ca
[WSO2 Release] [Jenkins #7320] [Release 9.30.58] prepare for next dev…
wso2-jenkins-bot Oct 18, 2024
733e50a
Fix naming convention
PasanT9 Oct 18, 2024
3075ab2
Merge pull request #12676 from PasanT9/review-fix-copy
PasanT9 Oct 19, 2024
ef66439
[WSO2 Release] [Jenkins #7322] [Release 9.30.59] prepare release v9.3…
wso2-jenkins-bot Oct 19, 2024
b5ea775
[WSO2 Release] [Jenkins #7322] [Release 9.30.59] prepare for next dev…
wso2-jenkins-bot Oct 19, 2024
5801196
Remove unused `aiConfiguration` from subscription validation flow
nimsara66 Oct 19, 2024
9bb8d4d
Add llm related scope mappings to tenant-conf.json
nimsara66 Oct 18, 2024
d1023a7
Merge pull request #12682 from nimsara66/rm-aiconfig
PasanT9 Oct 21, 2024
6d0aba3
create code owners file
nandika Oct 21, 2024
254e7af
[WSO2 Release] [Jenkins #7324] [Release 9.30.60] prepare release v9.3…
wso2-jenkins-bot Oct 21, 2024
24d9cd2
[WSO2 Release] [Jenkins #7324] [Release 9.30.60] prepare for next dev…
wso2-jenkins-bot Oct 21, 2024
0e12536
Fix SQL parse error
PasanT9 Oct 21, 2024
858c6fc
Bump identity governance version
RakhithaRR Oct 21, 2024
74ec405
Merge pull request #12685 from RakhithaRR/governance-version
RakhithaRR Oct 21, 2024
0f1db13
[WSO2 Release] [Jenkins #7326] [Release 9.30.61] prepare release v9.3…
wso2-jenkins-bot Oct 21, 2024
0880a91
[WSO2 Release] [Jenkins #7326] [Release 9.30.61] prepare for next dev…
wso2-jenkins-bot Oct 21, 2024
68e3f31
Fix NullPointer issue when invoking AI API resources
AnuGayan Oct 21, 2024
350a5f0
Revert "Fix NullPointer issue when invoking AI API resources"
AnuGayan Oct 21, 2024
2536487
Fix NullPointer issue when invoking AI API resources
AnuGayan Oct 21, 2024
bee7590
Merge branch 'master' of https://github.com/wso2/carbon-apimgt into m…
AnuGayan Oct 21, 2024
ca86fe6
Merge pull request #12684 from PasanT9/postgress-error-fix
RakhithaRR Oct 21, 2024
6a58ece
[WSO2 Release] [Jenkins #7328] [Release 9.30.62] prepare release v9.3…
wso2-jenkins-bot Oct 21, 2024
3fcf88a
[WSO2 Release] [Jenkins #7328] [Release 9.30.62] prepare for next dev…
wso2-jenkins-bot Oct 21, 2024
4cb3cfb
Merge branch 'master' of https://github.com/wso2/carbon-apimgt into m…
AnuGayan Oct 22, 2024
ff42649
Return LLM provider name and api version
PasanT9 Oct 22, 2024
c938dc1
Fix NullPointer issue when invoking AI API resources
AnuGayan Oct 22, 2024
63552fb
update code owners file
nandika Oct 22, 2024
239c237
Merge pull request #12687 from PasanT9/llm-name
ashera96 Oct 22, 2024
122b3dd
[WSO2 Release] [Jenkins #7330] [Release 9.30.63] prepare release v9.3…
wso2-jenkins-bot Oct 22, 2024
a3583e9
[WSO2 Release] [Jenkins #7330] [Release 9.30.63] prepare for next dev…
wso2-jenkins-bot Oct 22, 2024
6cb9308
Bump kernel to 4.9.27
RakhithaRR Oct 22, 2024
18a8db7
Fix minor issue in API Level logging
AnuGayan Oct 22, 2024
e10e31a
Increase default max_tokens for Mistral APIs
PasanT9 Oct 23, 2024
0b15e83
Merge pull request #12689 from PasanT9/max-token-fix
PasanT9 Oct 23, 2024
d1e9603
Increase default max count of mistral api request
AnuGayan Oct 23, 2024
3424f27
[WSO2 Release] [Jenkins #7332] [Release 9.30.64] prepare release v9.3…
wso2-jenkins-bot Oct 23, 2024
e0d4696
[WSO2 Release] [Jenkins #7332] [Release 9.30.64] prepare for next dev…
wso2-jenkins-bot Oct 23, 2024
d2be7d9
Merge pull request #12688 from RakhithaRR/kernel-final
RakhithaRR Oct 23, 2024
f33ddc1
[WSO2 Release] [Jenkins #7334] [Release 9.30.65] prepare release v9.3…
wso2-jenkins-bot Oct 23, 2024
cb27af1
[WSO2 Release] [Jenkins #7334] [Release 9.30.65] prepare for next dev…
wso2-jenkins-bot Oct 23, 2024
ca2de84
Merge pull request #12678 from nimsara66/3240
RakhithaRR Oct 23, 2024
e733864
Merge pull request #12686 from AnuGayan/master-AI-API-temp
RakhithaRR Oct 23, 2024
afe6fd5
[WSO2 Release] [Jenkins #7336] [Release 9.30.66] prepare release v9.3…
wso2-jenkins-bot Oct 23, 2024
642f812
[WSO2 Release] [Jenkins #7336] [Release 9.30.66] prepare for next dev…
wso2-jenkins-bot Oct 23, 2024
4c275e1
Add multi-dc db script changes for AI APIs
SavinduDimal Oct 24, 2024
0797925
Merge pull request #12690 from SavinduDimal/multidc-ai-api
RakhithaRR Oct 24, 2024
f3adc4d
[WSO2 Release] [Jenkins #7338] [Release 9.30.67] prepare release v9.3…
wso2-jenkins-bot Oct 24, 2024
eba3229
[WSO2 Release] [Jenkins #7338] [Release 9.30.67] prepare for next dev…
wso2-jenkins-bot Oct 24, 2024
302e2aa
Add custom policy replacement in key template
SavinduDimal Oct 28, 2024
4e3f2d0
[WSO2 Release] [Jenkins #7340] [Release 9.30.68] prepare release v9.3…
wso2-jenkins-bot Oct 31, 2024
08b3dc5
[WSO2 Release] [Jenkins #7340] [Release 9.30.68] prepare for next dev…
wso2-jenkins-bot Oct 31, 2024
3e4c659
Add AM_TRANSACTION_RECORDS table into multiDC scripts
dakshina99 Nov 4, 2024
9da433b
Handle processing of composed schemas in arrays
hisanhunais Oct 8, 2024
8ef5a59
Add comments to improve readability
hisanhunais Oct 9, 2024
c849771
Improve extracting references from composed schemas
hisanhunais Oct 15, 2024
b4270f2
Add logic to process header objects of responses
hisanhunais Oct 30, 2024
d484f74
Merge pull request #12693 from dakshina99/update-multidc-dbscripts-4.4.0
RakhithaRR Nov 5, 2024
3e2bc90
[WSO2 Release] [Jenkins #7342] [Release 9.30.69] prepare release v9.3…
wso2-jenkins-bot Nov 5, 2024
fbb797a
[WSO2 Release] [Jenkins #7342] [Release 9.30.69] prepare for next dev…
wso2-jenkins-bot Nov 5, 2024
20b4ba2
Avoid early throttling due to outdated events
dakshina99 Nov 7, 2024
ee49cd8
Merge pull request #12696 from dakshina99/early-throttling
AnuGayan Nov 8, 2024
d5b8cfc
[WSO2 Release] [Jenkins #7344] [Release 9.30.70] prepare release v9.3…
wso2-jenkins-bot Nov 8, 2024
c11f483
[WSO2 Release] [Jenkins #7344] [Release 9.30.70] prepare for next dev…
wso2-jenkins-bot Nov 8, 2024
457e924
Merge pull request #12694 from hisanhunais/product-def-improvements
hisanhunais Nov 8, 2024
9764b2d
[WSO2 Release] [Jenkins #7346] [Release 9.30.71] prepare release v9.3…
wso2-jenkins-bot Nov 8, 2024
a9aab7f
[WSO2 Release] [Jenkins #7346] [Release 9.30.71] prepare for next dev…
wso2-jenkins-bot Nov 8, 2024
9f2c722
Merge pull request #12538 from YasasRangika/yasas-master
YasasRangika Nov 11, 2024
3d54afe
[WSO2 Release] [Jenkins #7348] [Release 9.30.72] prepare release v9.3…
wso2-jenkins-bot Nov 11, 2024
cf08a14
[WSO2 Release] [Jenkins #7348] [Release 9.30.72] prepare for next dev…
wso2-jenkins-bot Nov 11, 2024
5de3c85
Merge pull request #12683 from nandika/master
nandika Nov 11, 2024
3777f30
[WSO2 Release] [Jenkins #7350] [Release 9.30.73] prepare release v9.3…
wso2-jenkins-bot Nov 11, 2024
907fb00
[WSO2 Release] [Jenkins #7350] [Release 9.30.73] prepare for next dev…
wso2-jenkins-bot Nov 11, 2024
0f49253
Merge pull request #12658 from nisan-abeywickrama/retry-after-header
tgtshanika Nov 12, 2024
8bc0128
[WSO2 Release] [Jenkins #7352] [Release 9.30.74] prepare release v9.3…
wso2-jenkins-bot Nov 12, 2024
86045d5
[WSO2 Release] [Jenkins #7352] [Release 9.30.74] prepare for next dev…
wso2-jenkins-bot Nov 12, 2024
3a1201e
Fix javassist related build failures
YasasRangika Nov 12, 2024
055a9fb
Merge pull request #12699 from YasasRangika/yasas-master
AnuGayan Nov 13, 2024
8be02ec
[WSO2 Release] [Jenkins #7354] [Release 9.30.75] prepare release v9.3…
wso2-jenkins-bot Nov 13, 2024
11155dc
[WSO2 Release] [Jenkins #7354] [Release 9.30.75] prepare for next dev…
wso2-jenkins-bot Nov 13, 2024
e650410
Increase the max length of the API Provider
dakshina99 Nov 20, 2024
b30f80b
Merge pull request #12704 from dakshina99/API-provider-length-increament
AnuGayan Nov 21, 2024
16e8feb
[WSO2 Release] [Jenkins #7356] [Release 9.30.76] prepare release v9.3…
wso2-jenkins-bot Nov 21, 2024
0f6c1e9
[WSO2 Release] [Jenkins #7356] [Release 9.30.76] prepare for next dev…
wso2-jenkins-bot Nov 21, 2024
9d8bb3d
Merge remote-tracking branch 'upstream/master' into org_visibility_ma…
chamilaadhi Nov 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 7 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Lines starting with '#' are comments.
# Each line is a file pattern followed by one or more owners.

# See: https://help.github.com/articles/about-codeowners/

# These owners will be the default owners for everything in the repo.
* @tharindu1st @AnuGayan @chamilaadhi @Arshardh @dushaniw @tgtshanika
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: 11.0.16+8
java-version: 11.0.24
distribution: 'temurin'
- uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
run: mv product-apim/modules/integration/tests-integration/tests-backend/target/surefire-reports/TEST-TestSuite.xml TEST-TestSuite_${{ matrix.id }}.xml
- name: Archive testng report
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: TEST-TestSuite_${{ matrix.id }}
path: |
Expand Down
6 changes: 5 additions & 1 deletion components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.wso2.carbon.apimgt</groupId>
<artifactId>apimgt</artifactId>
<version>9.29.196-SNAPSHOT</version>
<version>9.30.77-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -21,6 +21,10 @@
<name>WSO2 Carbon - API Management API</name>

<dependencies>
<dependency>
<groupId>org.wso2.orbit.com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.wso2.carbon.apimgt.api.model.Application;
import org.wso2.carbon.apimgt.api.model.ApplicationInfo;
import org.wso2.carbon.apimgt.api.model.Environment;
import org.wso2.carbon.apimgt.api.model.LLMProvider;
import org.wso2.carbon.apimgt.api.model.Monetization;
import org.wso2.carbon.apimgt.api.model.MonetizationUsagePublishInfo;
import org.wso2.carbon.apimgt.api.model.Workflow;
Expand Down Expand Up @@ -540,4 +541,57 @@ List<KeyManagerConfigurationDTO> getGlobalKeyManagerConfigurations(String organi
* @throws APIManagementException
*/
void deleteGlobalKeyManagerConfigurationById(String id) throws APIManagementException;

/**
* Adds a new LLM Provider for the given organization.
*
* @param organization the organization name to filter
* @param provider The LLM Provider to add.
* @return The added LLM Provider.
* @throws APIManagementException If adding fails.
*/
LLMProvider addLLMProvider(String organization, LLMProvider provider) throws APIManagementException;

/**
* Retrieves a list of LLM providers based on the given filters.
*
* @param organization the organization name to filter
* @param name the provider name to filter
* @param apiVersion the API version to filter
* @param builtInSupport whether to filter
* @return a list of LLM providers matching the specified filters
* @throws APIManagementException if an error occurs while retrieving the providers
*/
List<LLMProvider> getLLMProviders(String organization, String name, String apiVersion, Boolean builtInSupport) throws APIManagementException;

/**
* Deletes an LLM Provider by ID for the given organization.
*
* @param organization The organization name.
* @param provider LLM Provider.
* @param builtIn Whether the provider is built-in.
* @return Deleted LLM Provider UUID.
* @throws APIManagementException If deletion fails.
*/
String deleteLLMProvider(String organization, LLMProvider provider, boolean builtIn) throws APIManagementException;

/**
* Updates an LLM Provider for the given organization.
*
* @param organization The organization name.
* @param provider The LLM Provider with updated data.
* @return Updated LLM Provider.
* @throws APIManagementException If update fails.
*/
LLMProvider updateLLMProvider(String organization, LLMProvider provider) throws APIManagementException;

/**
* Retrieves an LLM Provider by ID for the given organization.
*
* @param organization The organization name.
* @param llmProviderId The ID of the LLM Provider.
* @return The LLM Provider.
* @throws APIManagementException If retrieval fails.
*/
LLMProvider getLLMProvider(String organization, String llmProviderId) throws APIManagementException;
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

package org.wso2.carbon.apimgt.api;

import java.io.File;

/**
* This class contains common constants for APIs.
*/
Expand All @@ -44,4 +46,55 @@ public class APIConstants {
public static final String ENDPOINT_SECURITY_PRODUCTION = "production";
public static final String ENDPOINT_SECURITY_SANDBOX = "sandbox";
public static final String ENDPOINT_CONFIG_SESSION_TIMEOUT = "sessionTimeOut";

public static class AIAPIConstants {
public static final String LLM_PROVIDERS = "llmProviders";
public static final String LLM_PROVIDER_ID = "llmProviderId";
public static final String API_KEY_IDENTIFIER_TYPE_HEADER = "HEADER";
public static final String API_KEY_IDENTIFIER_TYPE_QUERY_PARAMETER = "QUERY_PARAMETER";
public static final String AI_API_REQUEST_METADATA = "AI_API_REQUEST_METADATA";
public static final String AI_API_RESPONSE_METADATA = "AI_API_RESPONSE_METADATA";
public static final String INPUT_SOURCE_PAYLOAD = "payload";
public static final String CONNECTOR_TYPE = "connectorType";
public static final String ID = "id";
public static final String NAME = "name";
public static final String API_VERSION = "apiVersion";
public static final String LLM_PROVIDER_CONFIGURATIONS = "configurations";
public static final String LLM_CONFIGS_ENDPOINT = "/llm-providers";
public static final String CONFIGURATIONS = "configurations";
public static final String AI_API_DEFINITION_FILE_PATH = File.separator + "repository" + File.separator +
"resources" + File.separator + "api_definitions" + File.separator;
public static final String LLM_PROVIDER_SERVICE_AZURE_OPENAI_NAME = "AzureOpenAI";
public static final String LLM_PROVIDER_SERVICE_AZURE_OPENAI_VERSION = "1.0.0";
public static final String LLM_PROVIDER_SERVICE_AZURE_OPENAI_CONNECTOR = "azureOpenAi_1.0.0";
public static final String LLM_PROVIDER_SERVICE_AZURE_OPENAI_KEY = "api-key";
public static final String LLM_PROVIDER_SERVICE_AZURE_OPENAI_API_DEFINITION_FILE_NAME = "azure_api.yaml";
public static final String LLM_PROVIDER_SERVICE_AZURE_OPENAI_DESCRIPTION = "Azure OpenAI service";
public static final String LLM_PROVIDER_SERVICE_OPENAI_NAME = "OpenAI";
public static final String LLM_PROVIDER_SERVICE_OPENAI_VERSION = "1.0.0";
public static final String LLM_PROVIDER_SERVICE_OPENAI_CONNECTOR = "openAi_1.0.0";
public static final String LLM_PROVIDER_SERVICE_OPENAI_KEY = "Authorization";
public static final String LLM_PROVIDER_SERVICE_OPENAI_API_DEFINITION_FILE_NAME = "openai_api.yaml";
public static final String LLM_PROVIDER_SERVICE_OPENAI_DESCRIPTION = "OpenAI service";
public static final String LLM_PROVIDER_SERVICE_MISTRALAI_NAME = "MistralAI";
public static final String LLM_PROVIDER_SERVICE_MISTRALAI_VERSION = "1.0.0";
public static final String LLM_PROVIDER_SERVICE_MISTRALAI_CONNECTOR = "mistralAi_1.0.0";
public static final String LLM_PROVIDER_SERVICE_MISTRALAI_KEY = "Authorization";
public static final String LLM_PROVIDER_SERVICE_MISTRALAI_API_DEFINITION_FILE_NAME = "mistral_api.yaml";
public static final String LLM_PROVIDER_SERVICE_MISTRALAI_DESCRIPTION = "Mistral AI service";
public static final String LLM_PROVIDER_SERVICE_METADATA_MODEL = "model";
public static final String LLM_PROVIDER_SERVICE_METADATA_PROMPT_TOKEN_COUNT = "promptTokenCount";
public static final String LLM_PROVIDER_SERVICE_METADATA_COMPLETION_TOKEN_COUNT = "completionTokenCount";
public static final String LLM_PROVIDER_SERVICE_METADATA_TOTAL_TOKEN_COUNT = "totalTokenCount";
public static final String LLM_PROVIDER_SERVICE_METADATA_IDENTIFIER_MODEL = "$.model";
public static final String LLM_PROVIDER_SERVICE_METADATA_IDENTIFIER_PROMPT_TOKEN_COUNT = "$.usage" +
".prompt_tokens";
public static final String LLM_PROVIDER_SERVICE_METADATA_IDENTIFIER_COMPLETION_TOKEN_COUNT = "$.usage" +
".completion_tokens";
public static final String LLM_PROVIDER_SERVICE_METADATA_IDENTIFIER_TOTAL_TOKEN_COUNT = "$.usage.total_tokens";
public static final String LLM_PROVIDER_SERVICE_DEFAULT = "default";
public static final String NULL = "null";
public static final String LLM_PROVIDER = "LLM_PROVIDER";
public static final String LLM_PROVIDER_TENANT_ALL = "ALL";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,18 @@ Set<SubscribedAPI> getSubscribedIdentifiers(Subscriber subscriber,
String getOpenAPIDefinitionForEnvironment(API api, String environmentName)
throws APIManagementException;

/**
* Returns the swagger definition of the API for the given gateway environment and key manager as a string
*
* @param api
* @param environmentName API Gateway environment name
* @param kmId Key Manager UUID
* @return swagger string
* @throws APIManagementException if error occurred while obtaining the swagger definition
*/
String getOpenAPIDefinitionForEnvironmentByKm(API api, String environmentName, String kmId)
throws APIManagementException;

/**
* Revokes the oldAccessToken generating a new one.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,12 @@ public abstract String populateCustomManagementInfo(String oasDefinition, Swagge
* @param api API
* @param oasDefinition OAS definition
* @param hostsWithSchemes host addresses with protocol mapping
* @param kmId UUID of the Key Manager
* @return updated OAS definition
* @throws APIManagementException throws if an error occurred
*/
public abstract String getOASDefinitionForStore(API api, String oasDefinition, Map<String, String> hostsWithSchemes)
public abstract String getOASDefinitionForStore(API api, String oasDefinition, Map<String, String> hostsWithSchemes,
String kmId)
throws APIManagementException;

/**
Expand All @@ -176,11 +178,12 @@ public abstract String getOASDefinitionForStore(API api, String oasDefinition, M
* @param product APIProduct
* @param oasDefinition OAS definition
* @param hostsWithSchemes host addresses with protocol mapping
* @param kmId UUID of the Key Manager
* @return updated OAS definition
* @throws APIManagementException throws if an error occurred
*/
public abstract String getOASDefinitionForStore(APIProduct product, String oasDefinition,
Map<String, String> hostsWithSchemes) throws APIManagementException;
Map<String, String> hostsWithSchemes, String kmId) throws APIManagementException;

/**
* Update OAS definition for API Publisher
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.wso2.carbon.apimgt.api.model.policy.SubscriptionPolicy;

import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -65,6 +66,31 @@ public interface APIProvider extends APIManager {
Comment getComment(ApiTypeWrapper apiTypeWrapper, String commentId, Integer replyLimit, Integer replyOffset) throws
APIManagementException;

/**
* This method is to delete Sequence Backend by type
*
* @param apiUUID API Id
* @param type Key type
* @throws APIManagementException If failed to delete Sequence Backend
*/
void deleteCustomBackendByID(String apiUUID, String type) throws APIManagementException;

/**
* This method is to delete all Sequence Backends by APIID
*
* @param apiUUID API ID
* @throws APIManagementException If failed to delete Sequence Backend
*/
void deleteCustomBackendByAPIID(String apiUUID) throws APIManagementException;

/**
* This method is to delete Sequence Backends of a specific revision
* @param apiUUID API Id
* @param revisionId Revision Id
* @throws APIManagementException If failed to delete Sequence Backend
*/
void deleteSequenceBackendByRevision(String apiUUID, String revisionId) throws APIManagementException;

/**
* @param apiTypeWrapper Api type wrapper
* @param parentCommentID
Expand Down Expand Up @@ -315,6 +341,39 @@ List<SubscribedAPI> getSubscriptionsOfAPI(String apiName, String apiVersion, Str
*/
API updateAPI(API api, API existingAPI) throws APIManagementException, FaultGatewaysException;

/**
* This method is to update Sequence Backend
*
* @param api API
* @param type Key Type
* @param sequence Sequence Content
* @param seqName Sequence Name
* @param customBackendUUID Sequence Id
* @throws APIManagementException If not updated
*/
void updateCustomBackend(String api, String type, String sequence, String seqName, String customBackendUUID)
throws APIManagementException;

/**
* THis method is to retrieve Sequence Backend data
*
* @param apiUUID API Id
* @param type Key Type
* @return SequenceBackendData object
* @throws APIManagementException If data is not properly retrieved
*/
SequenceBackendData getCustomBackendByAPIUUID(String apiUUID, String type) throws APIManagementException;

/**
* This method is to retrieve all Sequence Backends of an API
*
* @param apiUUID API Id
* @return List of Sequence Backends
* @throws APIManagementException If not found
*/

List<SequenceBackendData> getAllSequenceBackendsByAPIUUID(String apiUUID) throws APIManagementException;

/**
* Create a new version of the <code>api</code>, with version <code>newVersion</code>
*
Expand Down Expand Up @@ -1701,6 +1760,15 @@ Map<String, Object> searchPaginatedAPIProducts(String searchQuery, String tenant
*/
String getSecuritySchemeOfAPI(String uuid, String organization) throws APIManagementException;

/**
* Returns whether subscription validation is disabled for an API
*
* @param uuid UUID of the API
* @return whether subscription validation is disabled
* @throws APIManagementException if failed get API from APIIdentifier
*/
boolean isSubscriptionValidationDisabled(String uuid) throws APIManagementException;

/**
* Returns details of an API
* @param uuid UUID of the API's registry artifact
Expand Down
Loading