fix: Phase 0c - update all in-function imports to use data_layer
Critical bug fix: In-function imports were still referencing calculations/ module. This caused all calculated placeholders to fail silently. Fixed imports in: - activity_metrics.py: calculate_activity_score (scores import) - recovery_metrics.py: calculate_recent_load_balance_3d (activity_metrics import) - scores.py: 12 function imports (body/nutrition/activity/recovery metrics) - correlations.py: 11 function imports (scores, body, nutrition, activity, recovery metrics) All data_layer modules now reference each other correctly. Placeholders should resolve properly now. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
1 parent
befa060671
commit
5b7d7ec3bb
4 files changed
+34
-34
No files matched your search
@@ -183,10 +183,10 @@ def calculate_goal_progress_score(profile_id: str) -> Optional[int]:
|
||||
return None # No goals/focus areas configured
|
||||
|
||||
# Calculate sub-scores
|
||||
from calculations.body_metrics import calculate_body_progress_score
|
||||
from calculations.nutrition_metrics import calculate_nutrition_score
|
||||
from calculations.activity_metrics import calculate_activity_score
|
||||
from calculations.recovery_metrics import calculate_recovery_score_v2
|
||||
from data_layer.body_metrics import calculate_body_progress_score
|
||||
from data_layer.nutrition_metrics import calculate_nutrition_score
|
||||
from data_layer.activity_metrics import calculate_activity_score
|
||||
from data_layer.recovery_metrics import calculate_recovery_score_v2
|
||||
|
||||
body_score = calculate_body_progress_score(profile_id, focus_weights)
|
||||
nutrition_score = calculate_nutrition_score(profile_id, focus_weights)
|
||||
@@ -404,10 +404,10 @@ def calculate_data_quality_score(profile_id: str) -> int:
|
||||
Overall data quality score (0-100)
|
||||
Combines quality from all modules
|
||||
"""
|
||||
from calculations.body_metrics import calculate_body_data_quality
|
||||
from calculations.nutrition_metrics import calculate_nutrition_data_quality
|
||||
from calculations.activity_metrics import calculate_activity_data_quality
|
||||
from calculations.recovery_metrics import calculate_recovery_data_quality
|
||||
from data_layer.body_metrics import calculate_body_data_quality
|
||||
from data_layer.nutrition_metrics import calculate_nutrition_data_quality
|
||||
from data_layer.activity_metrics import calculate_activity_data_quality
|
||||
from data_layer.recovery_metrics import calculate_recovery_data_quality
|
||||
|
||||
body_quality = calculate_body_data_quality(profile_id)
|
||||
nutrition_quality = calculate_nutrition_data_quality(profile_id)
|
||||
@@ -566,16 +566,16 @@ def calculate_category_progress(profile_id: str, category: str) -> Optional[int]
|
||||
|
||||
# Call the appropriate score function
|
||||
if score_func_name == 'body_progress_score':
|
||||
from calculations.body_metrics import calculate_body_progress_score
|
||||
from data_layer.body_metrics import calculate_body_progress_score
|
||||
return calculate_body_progress_score(profile_id)
|
||||
elif score_func_name == 'nutrition_score':
|
||||
from calculations.nutrition_metrics import calculate_nutrition_score
|
||||
from data_layer.nutrition_metrics import calculate_nutrition_score
|
||||
return calculate_nutrition_score(profile_id)
|
||||
elif score_func_name == 'activity_score':
|
||||
from calculations.activity_metrics import calculate_activity_score
|
||||
from data_layer.activity_metrics import calculate_activity_score
|
||||
return calculate_activity_score(profile_id)
|
||||
elif score_func_name == 'recovery_score':
|
||||
from calculations.recovery_metrics import calculate_recovery_score_v2
|
||||
from data_layer.recovery_metrics import calculate_recovery_score_v2
|
||||
return calculate_recovery_score_v2(profile_id)
|
||||
elif score_func_name == 'data_quality_score':
|
||||
return calculate_data_quality_score(profile_id)
|
||||
|
||||
Reference in new issue
Block a user