33import time
44from pathlib import Path
55from typing import Dict , List , Optional , Union
6+ from urllib .parse import quote
67
78from ..._request import coerce_request , dump_request
89from ....exceptions import HyperbrowserError
@@ -375,7 +376,16 @@ async def get_process(self, process_id: str) -> SandboxProcessHandle:
375376 return await self .processes .get (process_id )
376377
377378 def _hydrate (self , detail : SandboxDetail ) -> None :
379+ if (
380+ detail .startup_secrets is None
381+ and getattr (self , "_detail" , None ) is not None
382+ and self ._detail .startup_secrets is not None
383+ ):
384+ detail = detail .model_copy (
385+ update = {"startup_secrets" : self ._detail .startup_secrets }
386+ )
378387 self ._detail = detail
388+ self .startup_secrets = self ._detail .startup_secrets
379389 self ._runtime_session = self ._to_runtime_session (detail )
380390
381391 async def _resolve_runtime_connection (
@@ -396,18 +406,6 @@ async def _resolve_runtime_socket_info(self) -> RuntimeConnection:
396406 token = session .token ,
397407 )
398408
399- def _apply_runtime_session (self , session : SandboxRuntimeSession ) -> None :
400- self ._runtime_session = _copy_model (session )
401- self ._detail = self ._detail .model_copy (
402- update = {
403- "status" : session .status ,
404- "region" : session .region ,
405- "runtime" : session .runtime ,
406- "token" : session .token ,
407- "token_expires_at" : session .token_expires_at ,
408- }
409- )
410-
411409 def _clear_runtime_session (self , status : Optional [str ] = None ) -> None :
412410 self ._runtime_session = None
413411 self ._detail = self ._detail .model_copy (
@@ -492,7 +490,7 @@ async def list(
492490 return SandboxListResponse (** payload )
493491
494492 async def delete_image (self , image : str ) -> SandboxImageDeleteResult :
495- payload = await self ._request ("DELETE" , f"/images/{ image } " )
493+ payload = await self ._request ("DELETE" , f"/images/{ quote ( str ( image ), safe = '' ) } " )
496494 return SandboxImageDeleteResult (** payload )
497495
498496 async def list_images (
@@ -681,15 +679,21 @@ async def list_snapshots(
681679 return SandboxSnapshotListResponse (** payload )
682680
683681 async def get_snapshot (self , snapshot : str ) -> SandboxSnapshotSummary :
684- payload = await self ._request ("GET" , f"/snapshots/{ snapshot } " )
682+ payload = await self ._request (
683+ "GET" , f"/snapshots/{ quote (str (snapshot ), safe = '' )} "
684+ )
685685 return SandboxSnapshotSummary (** payload ["snapshot" ])
686686
687687 async def delete_snapshot (self , snapshot : str ) -> SandboxSnapshotDeleteResult :
688- payload = await self ._request ("DELETE" , f"/snapshots/{ snapshot } " )
688+ payload = await self ._request (
689+ "DELETE" , f"/snapshots/{ quote (str (snapshot ), safe = '' )} "
690+ )
689691 return SandboxSnapshotDeleteResult (** payload )
690692
691693 async def stop (self , sandbox_id : str ) -> BasicResponse :
692- payload = await self ._request ("PUT" , f"/sandbox/{ sandbox_id } /stop" )
694+ payload = await self ._request (
695+ "PUT" , f"/sandbox/{ quote (str (sandbox_id ), safe = '' )} /stop"
696+ )
693697 return BasicResponse (** payload )
694698
695699 async def create_image_build (
@@ -707,7 +711,9 @@ async def create_image_build(
707711 return SandboxImageBuildCreateResult (** payload )
708712
709713 async def get_image_build (self , build_id : str ) -> SandboxImageBuild :
710- payload = await self ._request ("GET" , f"/images/builds/{ build_id } " )
714+ payload = await self ._request (
715+ "GET" , f"/images/builds/{ quote (str (build_id ), safe = '' )} "
716+ )
711717 return SandboxImageBuild (** payload ["build" ])
712718
713719 async def reuse_docker_image (
@@ -734,13 +740,15 @@ async def complete_image_build(
734740 ) -> SandboxImageBuild :
735741 payload = await self ._request (
736742 "POST" ,
737- f"/images/builds/{ build_id } /complete" ,
743+ f"/images/builds/{ quote ( str ( build_id ), safe = '' ) } /complete" ,
738744 data = dump_request (params , CompleteSandboxImageBuildParams ),
739745 )
740746 return SandboxImageBuild (** payload ["build" ])
741747
742748 async def cancel_image_build (self , build_id : str ) -> SandboxImageBuild :
743- payload = await self ._request ("POST" , f"/images/builds/{ build_id } /cancel" )
749+ payload = await self ._request (
750+ "POST" , f"/images/builds/{ quote (str (build_id ), safe = '' )} /cancel"
751+ )
744752 return SandboxImageBuild (** payload ["build" ])
745753
746754 async def list_image_builds (
@@ -1104,7 +1112,9 @@ async def get_runtime_session(self, sandbox_id: str) -> SandboxRuntimeSession:
11041112 return session
11051113
11061114 async def get_detail (self , sandbox_id : str ) -> SandboxDetail :
1107- payload = await self ._request ("GET" , f"/sandbox/{ sandbox_id } " )
1115+ payload = await self ._request (
1116+ "GET" , f"/sandbox/{ quote (str (sandbox_id ), safe = '' )} "
1117+ )
11081118 return SandboxDetail (** payload )
11091119
11101120 def attach (self , detail : SandboxDetail ) -> SandboxHandle :
@@ -1119,7 +1129,7 @@ async def create_memory_snapshot(
11191129 ) -> SandboxMemorySnapshotResult :
11201130 payload = await self ._request (
11211131 "POST" ,
1122- f"/sandbox/{ sandbox_id } /snapshot" ,
1132+ f"/sandbox/{ quote ( str ( sandbox_id ), safe = '' ) } /snapshot" ,
11231133 data = dump_request (
11241134 params if params is not None else {},
11251135 SandboxMemorySnapshotParams ,
@@ -1134,7 +1144,7 @@ async def update_network(
11341144 ) -> SandboxNetworkUpdateResult :
11351145 payload = await self ._request (
11361146 "PUT" ,
1137- f"/sandbox/{ sandbox_id } /network" ,
1147+ f"/sandbox/{ quote ( str ( sandbox_id ), safe = '' ) } /network" ,
11381148 data = dump_request (
11391149 policy ,
11401150 SandboxNetworkPolicy ,
@@ -1153,7 +1163,7 @@ async def expose(
11531163 ) -> SandboxExposeResult :
11541164 payload = await self ._request (
11551165 "POST" ,
1156- f"/sandbox/{ sandbox_id } /expose" ,
1166+ f"/sandbox/{ quote ( str ( sandbox_id ), safe = '' ) } /expose" ,
11571167 data = dump_request (params , SandboxExposeParams ),
11581168 )
11591169 target_runtime = runtime or (await self .get_detail (sandbox_id )).runtime
@@ -1164,7 +1174,7 @@ async def expose(
11641174 async def unexpose (self , sandbox_id : str , port : int ) -> SandboxUnexposeResult :
11651175 payload = await self ._request (
11661176 "POST" ,
1167- f"/sandbox/{ sandbox_id } /unexpose" ,
1177+ f"/sandbox/{ quote ( str ( sandbox_id ), safe = '' ) } /unexpose" ,
11681178 data = {"port" : port },
11691179 )
11701180 return SandboxUnexposeResult (** payload )
@@ -1179,7 +1189,9 @@ async def start_secret_process(
11791189 """
11801190 try :
11811191 response = await self ._request (
1182- "POST" , f"/sandbox/{ sandbox_id } /processes" , data = payload
1192+ "POST" ,
1193+ f"/sandbox/{ quote (str (sandbox_id ), safe = '' )} /processes" ,
1194+ data = payload ,
11831195 )
11841196 except HyperbrowserError as error :
11851197 raise secret_process_start_error (sandbox_id , error )
0 commit comments