Skip to content

Commit 0fd28c5

Browse files
committed
Delete enterprise tests and run poetry
Also keeps certain upstream changes which caught up with us.
1 parent 90f6245 commit 0fd28c5

File tree

11 files changed

+2099
-1429
lines changed

11 files changed

+2099
-1429
lines changed

litellm/llms/bedrock/common_utils.py

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,8 @@ def get_ap_regions(self) -> List[str]:
5151
"ap-northeast-1", # Asia Pacific (Tokyo)
5252
"ap-northeast-2", # Asia Pacific (Seoul)
5353
"ap-northeast-3", # Asia Pacific (Osaka)
54-
<<<<<<< HEAD
55-
"ap-south-1", # Asia Pacific (Mumbai)
56-
"ap-south-2", # Asia Pacific (Hyderabad)
57-
=======
5854
"ap-south-1", # Asia Pacific (Mumbai)
5955
"ap-south-2", # Asia Pacific (Hyderabad)
60-
>>>>>>> BerriAI/main
6156
"ap-southeast-1", # Asia Pacific (Singapore)
6257
"ap-southeast-2", # Asia Pacific (Sydney)
6358
]
@@ -70,16 +65,6 @@ def get_eu_regions(self) -> List[str]:
7065
Source: https://www.aws-services.info/bedrock.html
7166
"""
7267
return [
73-
<<<<<<< HEAD
74-
"eu-west-1", # Europe (Ireland)
75-
"eu-west-2", # Europe (London)
76-
"eu-west-3", # Europe (Paris)
77-
"eu-central-1", # Europe (Frankfurt)
78-
"eu-central-2", # Europe (Zurich)
79-
"eu-south-1", # Europe (Milan)
80-
"eu-south-2", # Europe (Spain)
81-
"eu-north-1", # Europe (Stockholm)
82-
=======
8368
"eu-west-1", # Europe (Ireland)
8469
"eu-west-2", # Europe (London)
8570
"eu-west-3", # Europe (Paris)
@@ -88,7 +73,6 @@ def get_eu_regions(self) -> List[str]:
8873
"eu-south-1", # Europe (Milan)
8974
"eu-south-2", # Europe (Spain)
9075
"eu-north-1", # Europe (Stockholm)
91-
>>>>>>> BerriAI/main
9276
]
9377

9478
def get_ca_regions(self) -> List[str]:
@@ -99,16 +83,10 @@ def get_us_regions(self) -> List[str]:
9983
Source: https://www.aws-services.info/bedrock.html
10084
"""
10185
return [
102-
<<<<<<< HEAD
103-
"us-east-1", # US East (N. Virginia)
104-
"us-east-2", # US East (Ohio)
105-
"us-west-2", # US West (Oregon)
106-
=======
10786
"us-east-1", # US East (N. Virginia)
10887
"us-east-2", # US East (Ohio)
10988
"us-west-1", # US West (N. California)
11089
"us-west-2", # US West (Oregon)
111-
>>>>>>> BerriAI/main
11290
"us-gov-east-1", # AWS GovCloud (US-East)
11391
"us-gov-west-1", # AWS GovCloud (US-West)
11492
]

litellm/proxy/_experimental/out/onboarding.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)