Skip to content

Commit 90cd47a

Browse files
junawayjunaway
authored
Merge pull request #2899 from Agenta-AI/release/v0.62.0
release/v0.62.0
2 parents ef7e60a + 42d5249 commit 90cd47a

File tree

414 files changed

+2302
-2528
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

414 files changed

+2302
-2528
lines changed

‎api/ee/docker/Dockerfile.dev‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ RUN cat -A /etc/cron.d/meters-cron
3434
RUN chmod +x /meters.sh \
3535
&& chmod 0644 /etc/cron.d/meters-cron
3636

37-
COPY ./ee/src/crons/queries.sh /queries.sh
38-
COPY ./ee/src/crons/queries.txt /etc/cron.d/queries-cron
37+
COPY ./oss/src/crons/queries.sh /queries.sh
38+
COPY ./oss/src/crons/queries.txt /etc/cron.d/queries-cron
3939
RUN sed -i -e '$a\' /etc/cron.d/queries-cron
4040
RUN cat -A /etc/cron.d/queries-cron
4141

‎api/ee/docker/Dockerfile.gh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ RUN cat -A /etc/cron.d/meters-cron
3434
RUN chmod +x /meters.sh \
3535
&& chmod 0644 /etc/cron.d/meters-cron
3636

37-
COPY ./ee/src/crons/queries.sh /queries.sh
38-
COPY ./ee/src/crons/queries.txt /etc/cron.d/queries-cron
37+
COPY ./oss/src/crons/queries.sh /queries.sh
38+
COPY ./oss/src/crons/queries.txt /etc/cron.d/queries-cron
3939
RUN sed -i -e '$a\' /etc/cron.d/queries-cron
4040
RUN cat -A /etc/cron.d/queries-cron
4141

‎api/ee/src/apis/fastapi/billing/router.py‎

Lines changed: 49 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -824,12 +824,13 @@ async def create_portal_user_route(
824824
self,
825825
request: Request,
826826
):
827-
if not await check_action_access(
828-
user_uid=request.state.user_id,
829-
project_id=request.state.project_id,
830-
permission=Permission.EDIT_BILLING,
831-
):
832-
return FORBIDDEN_RESPONSE
827+
if is_ee():
828+
if not await check_action_access(
829+
user_uid=request.state.user_id,
830+
project_id=request.state.project_id,
831+
permission=Permission.EDIT_BILLING,
832+
):
833+
return FORBIDDEN_RESPONSE
833834

834835
return await self.create_portal(
835836
organization_id=request.state.organization_id,
@@ -851,12 +852,13 @@ async def create_checkout_user_route(
851852
plan: Plan = Query(...),
852853
success_url: str = Query(...), # find a way to make this optional or moot
853854
):
854-
if not await check_action_access(
855-
user_uid=request.state.user_id,
856-
project_id=request.state.project_id,
857-
permission=Permission.EDIT_BILLING,
858-
):
859-
return FORBIDDEN_RESPONSE
855+
if is_ee():
856+
if not await check_action_access(
857+
user_uid=request.state.user_id,
858+
project_id=request.state.project_id,
859+
permission=Permission.EDIT_BILLING,
860+
):
861+
return FORBIDDEN_RESPONSE
860862

861863
return await self.create_checkout(
862864
organization_id=request.state.organization_id,
@@ -882,12 +884,13 @@ async def fetch_plan_user_route(
882884
self,
883885
request: Request,
884886
):
885-
if not await check_action_access(
886-
user_uid=request.state.user_id,
887-
project_id=request.state.project_id,
888-
permission=Permission.VIEW_BILLING,
889-
):
890-
return FORBIDDEN_RESPONSE
887+
if is_ee():
888+
if not await check_action_access(
889+
user_uid=request.state.user_id,
890+
project_id=request.state.project_id,
891+
permission=Permission.VIEW_BILLING,
892+
):
893+
return FORBIDDEN_RESPONSE
891894

892895
return await self.fetch_plans(
893896
organization_id=request.state.organization_id,
@@ -899,12 +902,13 @@ async def switch_plans_user_route(
899902
request: Request,
900903
plan: Plan = Query(...),
901904
):
902-
if not await check_action_access(
903-
user_uid=request.state.user_id,
904-
project_id=request.state.project_id,
905-
permission=Permission.EDIT_BILLING,
906-
):
907-
return FORBIDDEN_RESPONSE
905+
if is_ee():
906+
if not await check_action_access(
907+
user_uid=request.state.user_id,
908+
project_id=request.state.project_id,
909+
permission=Permission.EDIT_BILLING,
910+
):
911+
return FORBIDDEN_RESPONSE
908912

909913
return await self.switch_plans(
910914
organization_id=request.state.organization_id,
@@ -927,12 +931,13 @@ async def fetch_subscription_user_route(
927931
self,
928932
request: Request,
929933
):
930-
if not await check_action_access(
931-
user_uid=request.state.user_id,
932-
project_id=request.state.project_id,
933-
permission=Permission.VIEW_BILLING,
934-
):
935-
return FORBIDDEN_RESPONSE
934+
if is_ee():
935+
if not await check_action_access(
936+
user_uid=request.state.user_id,
937+
project_id=request.state.project_id,
938+
permission=Permission.VIEW_BILLING,
939+
):
940+
return FORBIDDEN_RESPONSE
936941

937942
return await self.fetch_subscription(
938943
organization_id=request.state.organization_id,
@@ -943,12 +948,13 @@ async def cancel_subscription_user_route(
943948
self,
944949
request: Request,
945950
):
946-
if not await check_action_access(
947-
user_uid=request.state.user_id,
948-
project_id=request.state.project_id,
949-
permission=Permission.EDIT_BILLING,
950-
):
951-
return FORBIDDEN_RESPONSE
951+
if is_ee():
952+
if not await check_action_access(
953+
user_uid=request.state.user_id,
954+
project_id=request.state.project_id,
955+
permission=Permission.EDIT_BILLING,
956+
):
957+
return FORBIDDEN_RESPONSE
952958

953959
return await self.cancel_subscription(
954960
organization_id=request.state.organization_id,
@@ -968,12 +974,13 @@ async def fetch_usage_user_route(
968974
self,
969975
request: Request,
970976
):
971-
if not await check_action_access(
972-
user_uid=request.state.user_id,
973-
project_id=request.state.project_id,
974-
permission=Permission.VIEW_BILLING,
975-
):
976-
return FORBIDDEN_RESPONSE
977+
if is_ee():
978+
if not await check_action_access(
979+
user_uid=request.state.user_id,
980+
project_id=request.state.project_id,
981+
permission=Permission.VIEW_BILLING,
982+
):
983+
return FORBIDDEN_RESPONSE
977984

978985
return await self.fetch_usage(
979986
organization_id=request.state.organization_id,

‎api/ee/src/main.py‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22

33
from oss.src.utils.logging import get_module_logger
44

5-
from ee.src.routers import (
6-
workspace_router,
7-
organization_router,
8-
evaluation_router,
9-
human_evaluation_router,
10-
)
5+
from ee.src.routers import workspace_router, organization_router
116

127
from ee.src.dbs.postgres.meters.dao import MetersDAO
138
from ee.src.dbs.postgres.subscriptions.dao import SubscriptionsDAO
@@ -71,29 +66,11 @@ def extend_main(app: FastAPI):
7166
prefix="/workspaces",
7267
)
7368

74-
app.include_router(
75-
evaluation_router.router,
76-
prefix="/evaluations",
77-
tags=["Evaluations"],
78-
)
79-
80-
app.include_router(
81-
human_evaluation_router.router,
82-
prefix="/human-evaluations",
83-
tags=["Human-Evaluations"],
84-
)
85-
8669
# --------------------------------------------------------------------------
8770

8871
return app
8972

9073

91-
def load_tasks():
92-
import ee.src.tasks.evaluations.live
93-
import ee.src.tasks.evaluations.legacy
94-
import ee.src.tasks.evaluations.batch
95-
96-
9774
def extend_app_schema(app: FastAPI):
9875
app.openapi()["info"]["title"] = "Agenta API"
9976
app.openapi()["info"]["description"] = "Agenta API"

0 commit comments

Comments
 (0)