andre/crewAI
1
0
Fork 0
mirror of https://github.com/crewAIInc/crewAI.git synced 2026-05-02 15:52:34 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix: Respect use_system_prompt in Converter regeneration

Browse Source 
Fixes #2571

Co-authored-by: Devin AI <devin-ai-integration[bot]@users.noreply.github.com>

Co-Authored-By: Joe Moura <joao@crewai.com>
This commit is contained in:
Devin AI
2025-04-10 15:49:25 +00:00
parent c9f47e6a37
commit 44abceffaa
49 changed files with 599 additions and 2464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/crewai/security/security_config.py
View File

@@ -38,29 +38,27 @@ class SecurityConfig(BaseModel):
)
version: str = Field(
default="1.0.0",
description="Version of the security configuration"
default="1.0.0", description="Version of the security configuration"
)
fingerprint: Fingerprint = Field(
default_factory=Fingerprint,
description="Unique identifier for the component"
default_factory=Fingerprint, description="Unique identifier for the component"
)
def is_compatible(self, min_version: str) -> bool:
"""
Check if this security configuration is compatible with the minimum required version.
Args:
min_version (str): Minimum required version in semver format (e.g., "1.0.0")
Returns:
bool: True if this configuration is compatible, False otherwise
"""
# Simple version comparison (can be enhanced with packaging.version if needed)
current = [int(x) for x in self.version.split(".")]
minimum = [int(x) for x in min_version.split(".")]
# Compare major, minor, patch versions
for c, m in zip(current, minimum):
if c > m:
@@ -69,19 +67,19 @@ class SecurityConfig(BaseModel):
return False
return True
@model_validator(mode='before')
@model_validator(mode="before")
@classmethod
def validate_fingerprint(cls, values):
"""Ensure fingerprint is properly initialized."""
if isinstance(values, dict):
# Handle case where fingerprint is not provided or is None
if 'fingerprint' not in values or values['fingerprint'] is None:
values['fingerprint'] = Fingerprint()
if "fingerprint" not in values or values["fingerprint"] is None:
values["fingerprint"] = Fingerprint()
# Handle case where fingerprint is a string (seed)
elif isinstance(values['fingerprint'], str):
if not values['fingerprint'].strip():
elif isinstance(values["fingerprint"], str):
if not values["fingerprint"].strip():
raise ValueError("Fingerprint seed cannot be empty")
values['fingerprint'] = Fingerprint.generate(seed=values['fingerprint'])
values["fingerprint"] = Fingerprint.generate(seed=values["fingerprint"])
return values
def to_dict(self) -> Dict[str, Any]:
@@ -91,13 +89,11 @@ class SecurityConfig(BaseModel):
Returns:
Dict[str, Any]: Dictionary representation of the security config
"""
result = {
"fingerprint": self.fingerprint.to_dict()
}
result = {"fingerprint": self.fingerprint.to_dict()}
return result
@classmethod
def from_dict(cls, data: Dict[str, Any]) -> 'SecurityConfig':
def from_dict(cls, data: Dict[str, Any]) -> "SecurityConfig":
"""
Create a SecurityConfig from a dictionary.
@@ -111,6 +107,10 @@ class SecurityConfig(BaseModel):
data_copy = data.copy()
fingerprint_data = data_copy.pop("fingerprint", None)
fingerprint = Fingerprint.from_dict(fingerprint_data) if fingerprint_data else Fingerprint()
fingerprint = (
Fingerprint.from_dict(fingerprint_data)
if fingerprint_data
else Fingerprint()
)
return cls(fingerprint=fingerprint)