fix(sozo): model get not using prefixes

bin/sozo/src/commands/auth.rs

@@ -242,7 +242,11 @@ async fn clone_permissions(
             .external_writers
             .iter()
             .filter_map(|(resource_selector, writers)| {
-                if writers.contains(&from_address) { Some(*resource_selector) } else { None }
+                if writers.contains(&from_address) {
+                    Some(*resource_selector)
+                } else {
+                    None
+                }
             })
             .collect();
 
@@ -251,7 +255,11 @@ async fn clone_permissions(
             .external_owners
             .iter()
             .filter_map(|(resource_selector, owners)| {
-                if owners.contains(&from_address) { Some(*resource_selector) } else { None }
+                if owners.contains(&from_address) {
+                    Some(*resource_selector)
+                } else {
+                    None
+                }
             })
             .collect();
 
@@ -303,16 +311,20 @@ async fn clone_permissions(
     writers_resource_selectors.extend(external_writer_of.iter().copied());
     owners_resource_selectors.extend(external_owner_of.iter().copied());
 
-    writer_of.extend(
-        external_writer_of
-            .iter()
-            .map(|r| if r != &WORLD { format!("{:#066x}", r) } else { "World".to_string() }),
-    );
-    owner_of.extend(
-        external_owner_of
-            .iter()
-            .map(|r| if r != &WORLD { format!("{:#066x}", r) } else { "World".to_string() }),
-    );
+    writer_of.extend(external_writer_of.iter().map(|r| {
+        if r != &WORLD {
+            format!("{:#066x}", r)
+        } else {
+            "World".to_string()
+        }
+    }));
+    owner_of.extend(external_owner_of.iter().map(|r| {
+        if r != &WORLD {
+            format!("{:#066x}", r)
+        } else {
+            "World".to_string()
+        }
+    }));
 
     // Sort the tags to have a deterministic output.
     let mut writer_of = writer_of.into_iter().collect::<Vec<_>>();

bin/sozo/src/commands/mod.rs

@@ -47,8 +47,10 @@ pub enum Commands {
     Build(Box<BuildArgs>),
     #[command(about = "Build and migrate the world every time a file changes")]
     Dev(Box<DevArgs>),
-    #[command(about = "Run a migration, declaring and deploying contracts as necessary to update \
-                       the world")]
+    #[command(
+        about = "Run a migration, declaring and deploying contracts as necessary to update \
+                       the world"
+    )]
     Migrate(Box<MigrateArgs>),
     #[command(about = "Execute one or several systems with the given calldata.")]
     Execute(Box<ExecuteArgs>),

bin/sozo/src/commands/model.rs

@@ -1,5 +1,6 @@
 use anyhow::Result;
-use clap::{Args, Subcommand};
+use clap::{value_parser, Args, Subcommand};
+use dojo_world::config::calldata_decoder;
 use scarb::core::Config;
 use sozo_ops::model;
 use sozo_ops::resource_descriptor::ResourceDescriptor;
@@ -109,7 +110,11 @@ hashes, called 'hash' in the following documentation.
 
         #[arg(value_name = "KEYS")]
         #[arg(value_delimiter = ',')]
-        #[arg(help = "Comma seperated values e.g., 0x12345,0x69420,...")]
+        #[arg(help = "Comma separated values e.g., \
+                     0x12345,0x69420,sstr:\"hello\". Supported prefixes:\n  \
+                     - sstr: A cairo short string\n  \
+                     - no prefix: A cairo felt")]
+        #[arg(value_parser = model_key_parser)]
         keys: Vec<Felt>,
 
         #[command(flatten)]
@@ -119,11 +124,22 @@ hashes, called 'hash' in the following documentation.
         starknet: StarknetOptions,
 
         #[arg(short, long)]
-        #[arg(help = "Block number at which to retrieve the model data (pending block by default)")]
+        #[arg(
+            help = "Block number at which to retrieve the model data (pending block by default)"
+        )]
         block: Option<u64>,
     },
 }
 
+// Custom parser for model keys
+fn model_key_parser(s: &str) -> Result<Felt> {
+    if s.contains(':') && !s.starts_with("sstr:") {
+        anyhow::bail!("Only 'sstr:' prefix is supported for model keys");
+    }
+    let felts = calldata_decoder::decode_calldata(s)?;
+    Ok(felts[0])
+}
+
 impl ModelArgs {
     pub fn run(self, config: &Config) -> Result<()> {
         trace!(args = ?self);
@@ -222,3 +238,66 @@ impl ModelArgs {
         })
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use clap::Parser;
+    use starknet::core::utils::cairo_short_string_to_felt;
+
+    #[derive(Parser, Debug)]
+    struct TestCommand {
+        #[command(subcommand)]
+        command: ModelCommand,
+    }
+
+    #[test]
+    fn test_model_get_argument_parsing() {
+        // Test parsing with hex
+        let args = TestCommand::parse_from([
+            "model", // Placeholder for the binary name
+            "get",
+            "Account",
+            "0x054cb935d86d80b5a0a6e756edf448ab33876d01dd2b07a2a4e63a41e06d0ef5,0x6d69737479",
+        ]);
+
+        if let ModelCommand::Get { keys, .. } = args.command {
+            let expected = vec![
+                Felt::from_hex(
+                    "0x054cb935d86d80b5a0a6e756edf448ab33876d01dd2b07a2a4e63a41e06d0ef5",
+                )
+                .unwrap(),
+                Felt::from_hex("0x6d69737479").unwrap(),
+            ];
+            assert_eq!(keys, expected);
+        } else {
+            panic!("Expected Get command");
+        }
+
+        // Test parsing with string prefix
+        let args = TestCommand::parse_from([
+            "model",
+            "get",
+            "Account",
+            "0x054cb935d86d80b5a0a6e756edf448ab33876d01dd2b07a2a4e63a41e06d0ef5,sstr:\"misty\"",
+        ]);
+
+        if let ModelCommand::Get { keys, .. } = args.command {
+            let expected = vec![
+                Felt::from_hex(
+                    "0x054cb935d86d80b5a0a6e756edf448ab33876d01dd2b07a2a4e63a41e06d0ef5",
+                )
+                .unwrap(),
+                cairo_short_string_to_felt("misty").unwrap(),
+            ];
+            assert_eq!(keys, expected);
+        } else {
+            panic!("Expected Get command");
+        }
+
+        // Test invalid prefix
+        let result =
+            TestCommand::try_parse_from(["model", "get", "Account", "0x123,str:\"hello\""]);
+        assert!(result.is_err());
+    }
+}

crates/dojo/world/src/config/calldata_decoder.rs

@@ -161,7 +161,14 @@ pub fn decode_single_calldata(item: &str) -> DecoderResult<Vec<Felt>> {
         match prefix {
             "u256" => U256CalldataDecoder.decode(value)?,
             "str" => StrCalldataDecoder.decode(value)?,
-            "sstr" => ShortStrCalldataDecoder.decode(value)?,
+            "sstr" => {
+                let value = if value.starts_with('"') && value.ends_with('"') {
+                    value.trim_matches('"')
+                } else {
+                    value
+                };
+                ShortStrCalldataDecoder.decode(value)?
+            },
             "int" => SignedIntegerCalldataDecoder.decode(value)?,
             _ => DefaultCalldataDecoder.decode(item)?,
         }