fix

Author: mschuwalow

golem-common/src/base_model/worker.rs

@@ -12,17 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use super::agent::AgentTypeName;
-use super::component_metadata::ComponentMetadata;
 use crate::base_model::account::AccountId;
 use crate::base_model::component::{ComponentFilePermissions, ComponentRevision, PluginPriority};
 use crate::base_model::environment::EnvironmentId;
 use crate::base_model::oplog::WorkerResourceId;
 use crate::base_model::regions::OplogRegion;
 use crate::base_model::{OplogIndex, Timestamp, WorkerId, WorkerResourceDescription, WorkerStatus};
-use crate::model::agent::{ConfigKeyValueType, ConfigValueType};
 use crate::{declare_enums, declare_structs, declare_unions};
-use golem_wasm::ValueAndType;
 use golem_wasm_derive::{FromValue, IntoValue};
 use std::collections::{BTreeMap, HashMap, HashSet};
 use std::fmt::{Display, Formatter};
@@ -74,42 +70,6 @@ pub struct UntypedParsedWorkerCreationLocalAgentConfigEntry {
     pub value: golem_wasm::Value,
 }
 
-impl UntypedParsedWorkerCreationLocalAgentConfigEntry {
-    pub fn enrich_with_type(
-        self,
-        component_metadata: &ComponentMetadata,
-        agent_type_name: Option<&AgentTypeName>,
-    ) -> Result<ParsedWorkerCreationLocalAgentConfigEntry, String> {
-        let agent_type_name = agent_type_name.ok_or_else(|| {
-            "cannot enrich local agent config for non-agentic workers".to_string()
-        })?;
-
-        let value_type = component_metadata
-            .find_agent_type_by_name(agent_type_name)
-            .ok_or("did not find expected agent type in the metadata")?
-            .config
-            .into_iter()
-            .find_map(|c| match c {
-                ConfigKeyValueType {
-                    key,
-                    value: ConfigValueType::Local(inner),
-                } if key == self.key => Some(inner),
-                _ => None,
-            })
-            .ok_or_else(|| {
-                format!(
-                    "did not find config key {} in the metadata",
-                    self.key.join(".")
-                )
-            })?;
-
-        Ok(ParsedWorkerCreationLocalAgentConfigEntry {
-            key: self.key,
-            value: ValueAndType::new(self.value, value_type.value),
-        })
-    }
-}
-
 declare_structs! {
     pub struct WorkerCreationLocalAgentConfigEntry {
         pub key: Vec<String>,

golem-common/src/model/worker.rs

@@ -12,7 +12,47 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use super::agent::AgentTypeName;
+use super::component_metadata::ComponentMetadata;
 pub use crate::base_model::worker::*;
+use crate::model::agent::{ConfigKeyValueType, ConfigValueType};
+use golem_wasm::ValueAndType;
+
+impl UntypedParsedWorkerCreationLocalAgentConfigEntry {
+    pub fn enrich_with_type(
+        self,
+        component_metadata: &ComponentMetadata,
+        agent_type_name: Option<&AgentTypeName>,
+    ) -> Result<ParsedWorkerCreationLocalAgentConfigEntry, String> {
+        let agent_type_name = agent_type_name.ok_or_else(|| {
+            "cannot enrich local agent config for non-agentic workers".to_string()
+        })?;
+
+        let value_type = component_metadata
+            .find_agent_type_by_name(agent_type_name)
+            .ok_or("did not find expected agent type in the metadata")?
+            .config
+            .into_iter()
+            .find_map(|c| match c {
+                ConfigKeyValueType {
+                    key,
+                    value: ConfigValueType::Local(inner),
+                } if key == self.key => Some(inner),
+                _ => None,
+            })
+            .ok_or_else(|| {
+                format!(
+                    "did not find config key {} in the metadata",
+                    self.key.join(".")
+                )
+            })?;
+
+        Ok(ParsedWorkerCreationLocalAgentConfigEntry {
+            key: self.key,
+            value: ValueAndType::new(self.value, value_type.value),
+        })
+    }
+}
 
 mod protobuf {
     use super::{