shellsim 0.1.20__tar.gz → 0.1.22__tar.gz

{shellsim-0.1.20 → shellsim-0.1.22}/Cargo.lock

@@ -861,14 +861,16 @@ dependencies = [
 
 [[package]]
 name = "shellsim"
-version = "0.1.20"
+version = "0.1.22"
 dependencies = [
  "base64",
  "crc32fast",
  "flate2",
  "glob",
  "libc",
+ "libm",
  "md-5",
+ "memchr",
  "num-bigint",
  "num-traits",
  "regex",

{shellsim-0.1.20 → shellsim-0.1.22}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "shellsim"
-version = "0.1.20"
+version = "0.1.22"
 edition = "2021"
 description = "In-process BusyBox-like environment for RL rollouts and agent tests"
 license = "Apache-2.0"
@@ -39,9 +39,11 @@ md-5 = "0.10"
 base64 = "0.22"
 crc32fast = "1"
 flate2 = "1"
+memchr = "2"
 wasmtime = { version = "49.0.0", default-features = false, features = ["runtime", "cranelift", "gc-null", "std", "async", "call-hook"] }
 num-bigint = "0.4"
 num-traits = "0.2"
+libm = "0.2"
 
 # Process-level syscall sandbox (Linux only): a startup seccomp filter that denies
 # network/exec/fork so no Python-level trick can reach the real OS for those. shellsim

{shellsim-0.1.20 → shellsim-0.1.22}/PKG-INFO

@@ -1,8 +1,7 @@
 Metadata-Version: 2.4
 Name: shellsim
-Version: 0.1.20
+Version: 0.1.22
 Classifier: Development Status :: 3 - Alpha
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX :: Linux
@@ -15,6 +14,7 @@ License-File: LICENSE
 Summary: In-process BusyBox-like environment for RL rollouts and agent tests
 Keywords: agents,containers,reinforcement-learning,sandbox,simulation,testing
 Author: The shellsim authors
+License-Expression: Apache-2.0
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 Project-URL: Homepage, https://github.com/rjpower/shellsim
@@ -216,7 +216,7 @@ printf '%s\n' \
 ## Resource model
 
 CPU is deterministic fuel, memory is modeled working set, disk is current virtual-filesystem
-usage, and output bounds materialized stdout and stderr. The defaults are 10,000,000 CPU units,
+usage, and output bounds materialized stdout and stderr. The defaults are 100,000,000 CPU units,
 64 MiB memory, 64 MiB disk, and 4 MiB output. Costs use simple, stable approximations intended to
 be correct within an order of magnitude. They bound runaway work and make runs comparable; they
 do not model allocator layouts or instruction timing exactly. Exhaustion is observable and never

{shellsim-0.1.20 → shellsim-0.1.22}/README.md

@@ -193,7 +193,7 @@ printf '%s\n' \
 ## Resource model
 
 CPU is deterministic fuel, memory is modeled working set, disk is current virtual-filesystem
-usage, and output bounds materialized stdout and stderr. The defaults are 10,000,000 CPU units,
+usage, and output bounds materialized stdout and stderr. The defaults are 100,000,000 CPU units,
 64 MiB memory, 64 MiB disk, and 4 MiB output. Costs use simple, stable approximations intended to
 be correct within an order of magnitude. They bound runaway work and make runs comparable; they
 do not model allocator layouts or instruction timing exactly. Exhaustion is observable and never

{shellsim-0.1.20 → shellsim-0.1.22}/pyproject.toml

@@ -8,11 +8,11 @@ dynamic = ["version"]
 description = "In-process BusyBox-like environment for RL rollouts and agent tests"
 readme = "README.md"
 requires-python = ">=3.9"
-license = { file = "LICENSE" }
+license = "Apache-2.0"
+license-files = ["LICENSE"]
 authors = [{ name = "The shellsim authors" }]
 classifiers = [
     "Development Status :: 3 - Alpha",
-    "License :: OSI Approved :: Apache Software License",
     "Operating System :: MacOS :: MacOS X",
     "Operating System :: Microsoft :: Windows",
     "Operating System :: POSIX :: Linux",

{shellsim-0.1.20 → shellsim-0.1.22}/python/native/Cargo.lock

@@ -925,14 +925,16 @@ dependencies = [
 
 [[package]]
 name = "shellsim"
-version = "0.1.20"
+version = "0.1.22"
 dependencies = [
  "base64",
  "crc32fast",
  "flate2",
  "glob",
  "libc",
+ "libm",
  "md-5",
+ "memchr",
  "num-bigint",
  "num-traits",
  "regex",
@@ -947,7 +949,7 @@ dependencies = [
 
 [[package]]
 name = "shellsim-python-bindings"
-version = "0.1.20"
+version = "0.1.22"
 dependencies = [
  "pyo3",
  "serde",

{shellsim-0.1.20 → shellsim-0.1.22}/python/native/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "shellsim-python-bindings"
-version = "0.1.20"
+version = "0.1.22"
 edition = "2021"
 description = "Python bindings for shellsim"
 license = "Apache-2.0"

{shellsim-0.1.20 → shellsim-0.1.22}/python/shellsim/_api.py

@@ -19,7 +19,7 @@ _MAX_U64 = (1 << 64) - 1
 class Limits:
     """Cumulative resource limits for one simulated environment."""
 
-    cpu: int = 10_000_000
+    cpu: int = 100_000_000
     memory: int = 64 * 1024 * 1024
     disk: int = 64 * 1024 * 1024
     output: int = 4 * 1024 * 1024

{shellsim-0.1.20 → shellsim-0.1.22}/src/python/ast.rs

@@ -23,6 +23,10 @@ pub enum StatementKind {
         module: String,
         names: Vec<(String, String)>,
     },
+    /// `from module import *` binds the module's public names; only valid at module level.
+    ImportStar {
+        module: String,
+    },
     Assign {
         targets: Vec<AssignmentTarget>,
         value: Expression,
@@ -92,7 +96,11 @@ pub enum StatementKind {
         otherwise: Vec<Statement>,
         finalbody: Vec<Statement>,
     },
-    Raise(Option<Expression>),
+    /// `raise [exception [from cause]]`.
+    Raise {
+        exception: Option<Expression>,
+        cause: Option<Expression>,
+    },
     With {
         context: Expression,
         target: Option<AssignmentTarget>,
@@ -286,6 +294,8 @@ pub struct Parameter {
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum ParameterKind {
+    /// A parameter before a `/` marker, which callers cannot pass by keyword.
+    PositionalOnly,
     Positional,
     Variadic,
     KeywordOnly,
@@ -295,6 +305,8 @@ pub enum ParameterKind {
 #[derive(Clone, Debug, PartialEq)]
 pub enum Constant {
     None,
+    /// The `...` literal, which evaluates to the `Ellipsis` singleton.
+    Ellipsis,
     Bool(bool),
     Integer(i64),
     BigInteger(String),

{shellsim-0.1.20 → shellsim-0.1.22}/src/python/bytecode.rs

@@ -39,7 +39,7 @@ side_table_id!(CallId);
 side_table_id!(FunctionId);
 side_table_id!(ClassId);
 side_table_id!(FormatId);
-side_table_id!(DictId);
+side_table_id!(UnpackId);
 side_table_id!(ErrorId);
 
 #[derive(Clone, Debug, PartialEq)]
@@ -57,7 +57,8 @@ pub struct Code {
     functions: Box<[FunctionSpec]>,
     classes: Box<[ClassSpec]>,
     formats: Box<[FormatSpec]>,
-    dicts: Box<[Box<[bool]>]>,
+    /// Per-operand unpacking flags shared by dictionary and starred sequence displays.
+    unpack_flags: Box<[Box<[bool]>]>,
     errors: Box<[String]>,
 }
 
@@ -101,8 +102,8 @@ impl Code {
         &self.formats[id.index()]
     }
 
-    pub fn dict_entries(&self, id: DictId) -> &[bool] {
-        &self.dicts[id.index()]
+    pub fn unpack_flags(&self, id: UnpackId) -> &[bool] {
+        &self.unpack_flags[id.index()]
     }
 
     pub fn error(&self, id: ErrorId) -> &str {
@@ -119,6 +120,7 @@ pub struct Parameter {
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum ParameterKind {
+    PositionalOnly,
     Positional,
     Variadic,
     KeywordOnly,
@@ -181,6 +183,7 @@ pub enum Opcode {
     StoreGlobal(NameId),
     StoreAttribute(NameId),
     StoreSubscript,
+    DeleteAttribute(NameId),
     DeleteName(NameId),
     DeleteLocal(usize),
     DeleteGlobal(NameId),
@@ -189,6 +192,10 @@ pub enum Opcode {
         name: NameId,
         bind_root: bool,
     },
+    /// `from module import name`, with the module on top of the stack; it stays there.
+    ImportFrom(NameId),
+    /// `from module import *`: pop the module and bind its public names in the current scope.
+    ImportStar,
     LoadAttribute(NameId),
     LoadSubscript,
     BuildSlice {
@@ -198,8 +205,13 @@ pub enum Opcode {
     },
     BuildList(usize),
     BuildTuple(usize),
-    BuildDict(DictId),
+    BuildDict(UnpackId),
     BuildSet(usize),
+    /// A list, tuple, or set display with at least one `*iterable` operand.
+    BuildUnpacked {
+        kind: DisplayKind,
+        starred: UnpackId,
+    },
     UnpackSequence {
         count: usize,
         star_index: Option<usize>,
@@ -210,6 +222,8 @@ pub enum Opcode {
     ForIterator(usize),
     Unary(UnaryOperator),
     Binary(BinaryOperator),
+    /// Augmented assignment: the left operand's in-place method, else the binary operator.
+    InPlaceBinary(BinaryOperator),
     FormatValue(FormatId),
     Compare(ComparisonOperator),
     Call(CallId),
@@ -231,7 +245,9 @@ pub enum Opcode {
     ClearException,
     Reraise,
     Raise(bool),
+    RaiseFrom,
     Yield,
+    YieldFromSend(usize),
     AwaitResult,
     WithEnter,
     WithExit,
@@ -260,6 +276,7 @@ pub enum Operation {
     StoreGlobal(String),
     StoreAttribute(String),
     StoreSubscript,
+    DeleteAttribute(String),
     DeleteName(String),
     DeleteLocal(usize),
     DeleteGlobal(String),
@@ -268,6 +285,8 @@ pub enum Operation {
         name: String,
         bind_root: bool,
     },
+    ImportFrom(String),
+    ImportStar,
     LoadAttribute(String),
     LoadSubscript,
     BuildSlice {
@@ -281,6 +300,11 @@ pub enum Operation {
     /// consumes one key/value pair.
     BuildDict(Vec<bool>),
     BuildSet(usize),
+    /// Build a list, tuple, or set from source-ordered operands; `true` expands an iterable.
+    BuildUnpacked {
+        kind: DisplayKind,
+        starred: Vec<bool>,
+    },
     UnpackSequence {
         count: usize,
         star_index: Option<usize>,
@@ -301,6 +325,8 @@ pub enum Operation {
     ForIterator(usize),
     Unary(UnaryOperator),
     Binary(BinaryOperator),
+    /// Augmented assignment: the left operand's in-place method, else the binary operator.
+    InPlaceBinary(BinaryOperator),
     FormatValue {
         conversion: Option<char>,
         format_spec: String,
@@ -331,8 +357,15 @@ pub enum Operation {
     ClearException,
     Reraise,
     Raise(bool),
+    /// `raise exception from cause`: pops the cause, then the exception.
+    RaiseFrom,
     /// Suspend a generator frame and return the value on top of the stack.
     Yield,
+    /// One step of `yield from`: pop the value sent into the generator and pass it to the
+    /// subiterator below it. A yielded value suspends the frame at this same instruction, so the
+    /// next `send` repeats the step; when the subiterator finishes, it is replaced by its return
+    /// value and control jumps to the target.
+    YieldFromSend(usize),
     /// Unwrap the scheduler outcome sent into a suspended coroutine.
     AwaitResult,
     WithEnter,
@@ -344,6 +377,14 @@ pub enum Operation {
     Halt,
 }
 
+/// The container a sequence display builds.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum DisplayKind {
+    List,
+    Tuple,
+    Set,
+}
+
 #[derive(Default)]
 pub struct CodeBuilder {
     names: Vec<Arc<str>>,
@@ -353,7 +394,7 @@ pub struct CodeBuilder {
     functions: Vec<FunctionSpec>,
     classes: Vec<ClassSpec>,
     formats: Vec<FormatSpec>,
-    dicts: Vec<Box<[bool]>>,
+    unpack_flags: Vec<Box<[bool]>>,
     errors: Vec<String>,
 }
 
@@ -369,6 +410,12 @@ impl CodeBuilder {
         id
     }
 
+    fn unpack_flags(&mut self, flags: Vec<bool>) -> UnpackId {
+        let id = UnpackId::new(self.unpack_flags.len());
+        self.unpack_flags.push(flags.into_boxed_slice());
+        id
+    }
+
     pub fn lower(&mut self, operation: Operation) -> Opcode {
         match operation {
             Operation::LoadConstant(value) => {
@@ -389,6 +436,7 @@ impl CodeBuilder {
             Operation::StoreGlobal(name) => Opcode::StoreGlobal(self.name(name)),
             Operation::StoreAttribute(name) => Opcode::StoreAttribute(self.name(name)),
             Operation::StoreSubscript => Opcode::StoreSubscript,
+            Operation::DeleteAttribute(name) => Opcode::DeleteAttribute(self.name(name)),
             Operation::DeleteName(name) => Opcode::DeleteName(self.name(name)),
             Operation::DeleteLocal(slot) => Opcode::DeleteLocal(slot),
             Operation::DeleteGlobal(name) => Opcode::DeleteGlobal(self.name(name)),
@@ -397,6 +445,8 @@ impl CodeBuilder {
                 name: self.name(name),
                 bind_root,
             },
+            Operation::ImportFrom(name) => Opcode::ImportFrom(self.name(name)),
+            Operation::ImportStar => Opcode::ImportStar,
             Operation::LoadAttribute(name) => Opcode::LoadAttribute(self.name(name)),
             Operation::LoadSubscript => Opcode::LoadSubscript,
             Operation::BuildSlice {
@@ -410,12 +460,12 @@ impl CodeBuilder {
             },
             Operation::BuildList(count) => Opcode::BuildList(count),
             Operation::BuildTuple(count) => Opcode::BuildTuple(count),
-            Operation::BuildDict(entries) => {
-                let id = DictId::new(self.dicts.len());
-                self.dicts.push(entries.into_boxed_slice());
-                Opcode::BuildDict(id)
-            }
+            Operation::BuildDict(entries) => Opcode::BuildDict(self.unpack_flags(entries)),
             Operation::BuildSet(count) => Opcode::BuildSet(count),
+            Operation::BuildUnpacked { kind, starred } => Opcode::BuildUnpacked {
+                kind,
+                starred: self.unpack_flags(starred),
+            },
             Operation::UnpackSequence { count, star_index } => {
                 Opcode::UnpackSequence { count, star_index }
             }
@@ -455,6 +505,7 @@ impl CodeBuilder {
             Operation::ForIterator(target) => Opcode::ForIterator(target),
             Operation::Unary(operator) => Opcode::Unary(operator),
             Operation::Binary(operator) => Opcode::Binary(operator),
+            Operation::InPlaceBinary(operator) => Opcode::InPlaceBinary(operator),
             Operation::FormatValue {
                 conversion,
                 format_spec,
@@ -504,7 +555,9 @@ impl CodeBuilder {
             Operation::ClearException => Opcode::ClearException,
             Operation::Reraise => Opcode::Reraise,
             Operation::Raise(cause) => Opcode::Raise(cause),
+            Operation::RaiseFrom => Opcode::RaiseFrom,
             Operation::Yield => Opcode::Yield,
+            Operation::YieldFromSend(target) => Opcode::YieldFromSend(target),
             Operation::AwaitResult => Opcode::AwaitResult,
             Operation::WithEnter => Opcode::WithEnter,
             Operation::WithExit => Opcode::WithExit,
@@ -526,12 +579,17 @@ impl CodeBuilder {
     ) -> CodeRef {
         let positional_count = parameters
             .iter()
-            .take_while(|parameter| parameter.kind == ParameterKind::Positional)
+            .take_while(|parameter| {
+                matches!(
+                    parameter.kind,
+                    ParameterKind::PositionalOnly | ParameterKind::Positional
+                )
+            })
             .count();
         let call_signature = CallSignature {
-            is_generator: instructions
-                .iter()
-                .any(|instruction| matches!(instruction.opcode, Opcode::Yield)),
+            is_generator: instructions.iter().any(|instruction| {
+                matches!(instruction.opcode, Opcode::Yield | Opcode::YieldFromSend(_))
+            }),
             is_coroutine,
             positional_count,
             variadic_slot: parameters
@@ -559,7 +617,7 @@ impl CodeBuilder {
             functions: self.functions.into_boxed_slice(),
             classes: self.classes.into_boxed_slice(),
             formats: self.formats.into_boxed_slice(),
-            dicts: self.dicts.into_boxed_slice(),
+            unpack_flags: self.unpack_flags.into_boxed_slice(),
             errors: self.errors.into_boxed_slice(),
         })
     }