Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
65a11fd
add release note 120
zhongwen666 Feb 3, 2026
9157582
Revert "add release note 120"
zhongwen666 Feb 3, 2026
dba7590
Merge branch 'alibaba:master' into master
zhongwen666 Feb 3, 2026
fab60b2
add version (#422)
zhongwen666 Feb 3, 2026
69c7b5a
add namespace metrics
Dengsheng-wzh Feb 3, 2026
8085541
add v1.0.4 doc
Dengsheng-wzh Feb 3, 2026
50cfa8b
add qwen code/cursor cli examples (#426)
BCeZn Feb 4, 2026
a1aaff0
chore: update docs version config (#431)
BCeZn Feb 4, 2026
7e85ee1
scheduler conf to nacos
zhongwen666 Feb 6, 2026
ae142a8
chore: remove unnecessary test step from python publish workflow (#446)
BCeZn Feb 6, 2026
d665dc0
chore: bump version number to 1.2.2 (#448)
BCeZn Feb 6, 2026
bd06e4e
refactor: delegate sandbox lifecycle management operations to operato…
FangwenDave Feb 6, 2026
a4ef31c
Feature/xinshi/dev proxy http (#453)
BCeZn Feb 9, 2026
5fd53d9
feat: add sandbox proxy demo and related configurations (#455)
BCeZn Feb 9, 2026
498b6e4
Feature/openclaw demo (#457)
BCeZn Feb 9, 2026
23f71bd
chore: add auto clear seconds parameter to sandbox config (#458)
BCeZn Feb 9, 2026
7009de1
docs: add python sdk references docs for version 1.3.x (#460)
BCeZn Feb 9, 2026
96899d0
chore: update expire time in sandbox proxy service (#462)
BCeZn Feb 9, 2026
3036d4a
Doc/v1.2.1 0210 (#467)
zhongwen666 Feb 10, 2026
ec4f0cd
Fix/sehculder task file not detection 0210 (#465)
zhongwen666 Feb 10, 2026
6bc81ee
feat: monitor support specified endpoint #468 (#469)
FangwenDave Feb 11, 2026
83b9328
scheduler conf to nacos
zhongwen666 Feb 6, 2026
6184509
update version
zhongwen666 Feb 12, 2026
5cab4e5
update uv
zhongwen666 Feb 12, 2026
e37ceb9
refactor: move non-management methods back to proxy service (#433)
FangwenDave Feb 11, 2026
31f2385
feat(sdk): implement close_session method in Sandbox client #449 (#451)
bird2426 Feb 11, 2026
a6f47f2
Sandbox runtime support kata (#474)
zhongwen666 Feb 11, 2026
39111a8
docs: update openclaw demo prerequisites section (#476)
BCeZn Feb 11, 2026
75e17e1
support aliyun mse server_addresses
xuehaitaotal-hue Feb 12, 2026
b63f986
Merge branch 'master' into dev/scheduler_conf_to_nacos_0206
zhongwen666 Feb 12, 2026
5fe1b6d
Merge branch 'alibaba:master' into dev/scheduler_conf_to_nacos_0206
zhongwen666 Feb 24, 2026
65e7561
Add callback function abstraction to Nacos; load scheduler process in…
zhongwen666 Feb 24, 2026
c43cf25
update uv
zhongwen666 Feb 24, 2026
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
13 changes: 11 additions & 2 deletions rock/admin/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import uvicorn
from fastapi import FastAPI, Request
from OpenSource.rock.utils.system import is_primary_pod
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

怎么还能有from OpenSource呢

from starlette.middleware.cors import CORSMiddleware
from starlette.responses import JSONResponse

Expand All @@ -19,15 +20,14 @@
from rock.admin.entrypoints.warmup_api import set_warmup_service, warmup_router
from rock.admin.gem.api import gem_router, set_env_service
from rock.admin.scheduler.scheduler import SchedulerProcess
from rock.config import RockConfig
from rock.config import RockConfig, SchedulerConfig
from rock.logger import init_logger
from rock.sandbox.gem_manager import GemManager
from rock.sandbox.operator.factory import OperatorContext, OperatorFactory
from rock.sandbox.service.sandbox_proxy_service import SandboxProxyService
from rock.sandbox.service.warmup_service import WarmupService
from rock.utils import EAGLE_EYE_TRACE_ID, sandbox_id_ctx_var, trace_id_ctx_var
from rock.utils.providers import RedisProvider
from rock.utils.system import is_primary_pod

parser = argparse.ArgumentParser()
parser.add_argument("--env", type=str, default="local")
Expand All @@ -48,6 +48,14 @@ async def lifespan(app: FastAPI):
else env_vars.ROCK_CONFIG
)
rock_config = RockConfig.from_env(config_file_path)

# Override scheduler config from Nacos if available
if rock_config.nacos_provider:
nacos_config = await rock_config.nacos_provider.get_config()
if nacos_config and "scheduler" in nacos_config:
rock_config.scheduler = SchedulerConfig(**nacos_config["scheduler"])
logger.info(f"Overrode scheduler config from Nacos with {len(rock_config.scheduler.tasks)} tasks")

env_vars.ROCK_ADMIN_ENV = args.env
env_vars.ROCK_ADMIN_ROLE = args.role

Expand Down Expand Up @@ -112,6 +120,7 @@ async def lifespan(app: FastAPI):
scheduler_config=rock_config.scheduler,
ray_address=rock_config.ray.address,
ray_namespace=rock_config.ray.namespace,
nacos_config=rock_config.nacos if rock_config.nacos.endpoint else None,
)
scheduler_process.start()
logger.info("Scheduler process started on primary pod")
Expand Down
Loading
Loading