Skip to content

Commit df703fe

Browse files
authored
Merge pull request #948 from transformerlab/add/remove-workos-routes-again
Remove WorkOS deps from the API
2 parents 36368fa + 12155ce commit df703fe

File tree

17 files changed

+103
-1269
lines changed

17 files changed

+103
-1269
lines changed

api/api.py

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,10 @@
5959
tools,
6060
batched_prompts,
6161
recipes,
62-
remote,
63-
auth2,
6462
teams,
63+
auth,
6564
)
66-
from transformerlab.routers.auth2 import get_user_and_team # noqa: E402
65+
from transformerlab.routers.auth import get_user_and_team # noqa: E402
6766
import torch # noqa: E402
6867

6968
try:
@@ -221,9 +220,6 @@ async def validation_exception_handler(request, exc):
221220
return create_error_response(ErrorCode.VALIDATION_TYPE_ERROR, str(exc))
222221

223222

224-
### END GENERAL API - NOT OPENAI COMPATIBLE ###
225-
226-
227223
app.include_router(model.router, dependencies=[Depends(get_user_and_team)])
228224
app.include_router(serverinfo.router, dependencies=[Depends(get_user_and_team)])
229225
app.include_router(train.router, dependencies=[Depends(get_user_and_team)])
@@ -238,17 +234,9 @@ async def validation_exception_handler(request, exc):
238234
app.include_router(tools.router, dependencies=[Depends(get_user_and_team)])
239235
app.include_router(recipes.router, dependencies=[Depends(get_user_and_team)])
240236
app.include_router(batched_prompts.router, dependencies=[Depends(get_user_and_team)])
241-
app.include_router(remote.router, dependencies=[Depends(get_user_and_team)])
242237
app.include_router(fastchat_openai_api.router, dependencies=[Depends(get_user_and_team)])
243238
app.include_router(teams.router, dependencies=[Depends(get_user_and_team)])
244-
app.include_router(auth2.router)
245-
246-
# Authentication and session management routes
247-
if os.getenv("TFL_MULTITENANT") == "true":
248-
from transformerlab.routers import auth # noqa: E402
249-
250-
app.include_router(auth.router)
251-
239+
app.include_router(auth.router)
252240

253241
controller_process = None
254242
worker_process = None

api/requirements-no-gpu-uv.txt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This file was autogenerated by uv via the following command:
2-
# uv pip compile requirements.in -o requirements-no-gpu-uv.txt --index-strategy unsafe-best-match
2+
# uv pip compile requirements.in -o requirements-no-gpu-uv.txt
33
absl-py==2.1.0
44
# via tensorboard
55
accelerate==1.3.0
@@ -94,7 +94,6 @@ cryptography==44.0.2
9494
# msal
9595
# pdfminer-six
9696
# pyjwt
97-
# workos
9897
datasets==3.6.0
9998
# via
10099
# -r requirements.in
@@ -179,7 +178,6 @@ httpx==0.28.1
179178
# via
180179
# mcp
181180
# transformerlab-inference
182-
# workos
183181
httpx-sse==0.4.0
184182
# via mcp
185183
huggingface-hub==0.34.3
@@ -408,7 +406,6 @@ pydantic==2.11.7
408406
# pydantic-settings
409407
# transformerlab-inference
410408
# wandb
411-
# workos
412409
pydantic-core==2.33.2
413410
# via pydantic
414411
pydantic-settings==2.8.1
@@ -426,7 +423,6 @@ pyjwt==2.10.1
426423
# via
427424
# fastapi-users
428425
# msal
429-
# workos
430426
pytest==8.4.2
431427
# via transformerlab
432428
python-dateutil==2.9.0.post0
@@ -518,6 +514,7 @@ setproctitle==1.3.5
518514
setuptools==70.2.0
519515
# via
520516
# tensorboard
517+
# torch
521518
# wandb
522519
shellingham==1.5.4
523520
# via typer
@@ -671,8 +668,6 @@ werkzeug==3.1.3
671668
# -r requirements.in
672669
# tensorboard
673670
# transformerlab
674-
workos==5.28.0
675-
# via -r requirements.in
676671
wrapt==1.17.3
677672
# via aiobotocore
678673
xlrd==2.0.1

api/requirements-rocm-uv.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,7 @@ setuptools==70.2.0
521521
# via
522522
# pytorch-triton-rocm
523523
# tensorboard
524+
# torch
524525
# wandb
525526
shellingham==1.5.4
526527
# via typer

api/requirements-uv.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ cryptography==44.0.2
9494
# msal
9595
# pdfminer-six
9696
# pyjwt
97-
# workos
9897
datasets==3.6.0
9998
# via
10099
# -r requirements.in
@@ -179,7 +178,6 @@ httpx==0.28.1
179178
# via
180179
# mcp
181180
# transformerlab-inference
182-
# workos
183181
httpx-sse==0.4.0
184182
# via mcp
185183
huggingface-hub==0.34.3
@@ -445,7 +443,6 @@ pydantic==2.11.7
445443
# pydantic-settings
446444
# transformerlab-inference
447445
# wandb
448-
# workos
449446
pydantic-core==2.33.2
450447
# via pydantic
451448
pydantic-settings==2.8.1
@@ -463,7 +460,6 @@ pyjwt==2.10.1
463460
# via
464461
# fastapi-users
465462
# msal
466-
# workos
467463
pytest==8.4.2
468464
# via transformerlab
469465
python-dateutil==2.9.0.post0
@@ -555,6 +551,7 @@ setproctitle==1.3.5
555551
setuptools==70.2.0
556552
# via
557553
# tensorboard
554+
# torch
558555
# triton
559556
# wandb
560557
shellingham==1.5.4
@@ -711,8 +708,6 @@ werkzeug==3.1.3
711708
# -r requirements.in
712709
# tensorboard
713710
# transformerlab
714-
workos==5.28.0
715-
# via -r requirements.in
716711
wrapt==1.17.3
717712
# via aiobotocore
718713
xlrd==2.0.1

api/requirements.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ watchfiles
2424
wandb==0.19.10
2525
tensorboardX
2626
werkzeug
27-
workos
2827
sqlalchemy[asyncio]
2928
sentence-transformers
3029
markitdown[all]

api/test/api/test_remote.py

Lines changed: 0 additions & 230 deletions
This file was deleted.
File renamed without changes.

api/transformerlab/routers/auth/__init__.py

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)