admin/dog_training
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feat: Architecture redesign for Assessments, Commands, Modalities, Training Techniques, Reinforcement Schedules, Distractions, and Assessment Responses.

Browse Source
This commit is contained in:
Teddy Middleton-Smith
2025-09-06 12:13:16 +01:00
parent 12f5fc994f
commit 2da465935d
158 changed files with 14781 additions and 3477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
business_objects/dog/assessment.py
View File

@@ -9,6 +9,7 @@ Feature: Assessment Business Object
# internal
from business_objects.base import Base
from business_objects.dog.assessment_type import Assessment_Type
from business_objects.dog.command import Command
# from business_objects.dog.command_category import Command_Category
from business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base
@@ -30,7 +31,7 @@ from typing import ClassVar, Optional
class Assessment(SQLAlchemy_ABC, Base):
ATTR_ID_ASSESSMENT: ClassVar[str] = Filters_Assessment.ATTR_ID_ASSESSMENT
FLAG_ASSESSMENT: ClassVar[str] = 'assessment'
FLAG_ASSESSMENT_COMMAND_MODALITY_LINK: ClassVar[str] = 'assessment_command_modality_link'
FLAG_ASSESSMENT_COMMAND_LINK: ClassVar[str] = 'assessment_command_link'
FLAG_DISTRACTION: ClassVar[str] = 'distraction'
FLAG_TEMPERATURE_CELCIUS: ClassVar[str] = 'temperature_celcius'
FLAG_USER_HANDLER: ClassVar[str] = Filters_Assessment.FLAG_USER_HANDLER
@@ -41,6 +42,7 @@ class Assessment(SQLAlchemy_ABC, Base):
__table_args__ = { 'extend_existing': True }
id_assessment = db.Column(db.Integer, primary_key=True)
id_assessment_type = db.Column(db.Integer)
id_weather = db.Column(db.Integer)
id_lighting_level = db.Column(db.Integer)
id_location = db.Column(db.Integer)
@@ -48,19 +50,22 @@ class Assessment(SQLAlchemy_ABC, Base):
notes = db.Column(db.Text)
temperature_celcius = db.Column(db.Numeric(5, 2))
# difficulty_level = db.Column(db.Float)
start_on = db.Column(db.DateTime)
end_on = db.Column(db.DateTime)
active = db.Column(db.Boolean)
created_on = db.Column(db.DateTime)
def __init__(self):
self.id_assessment = 0
self.is_new = False
self.assessment_type = None
self.weather = None
self.lighting_level = None
self.temperature_celcius = 22
self.location = None
self.user_handler = None
self.distractions = []
self.assessment_command_modality_links = []
self.assessment_command_links = []
super().__init__()
@classmethod
@@ -68,20 +73,24 @@ class Assessment(SQLAlchemy_ABC, Base):
_m = f'{cls.__qualname__}.from_db_assessment'
assessment = cls()
assessment.id_assessment = query_row[0]
assessment.id_weather = query_row[1]
assessment.id_lighting_level = query_row[3]
assessment.id_location = query_row[5]
assessment.id_user_handler = query_row[7]
assessment.notes = query_row[10]
assessment.temperature_celcius = query_row[11]
assessment.active = av.input_bool(query_row[12], 'active', _m)
assessment.id_assessment = query_row[1]
assessment.id_weather = query_row[2]
assessment.id_lighting_level = query_row[4]
assessment.id_location = query_row[6]
assessment.id_user_handler = query_row[8]
assessment.notes = query_row[11]
assessment.temperature_celcius = query_row[12]
assessment.start_on = query_row[13]
assessment.end_on = query_row[14]
assessment.active = av.input_bool(query_row[15], 'active', _m)
assessment.assessment_type = Assessment_Type.from_db_assessment(query_row)
assessment.weather = Weather.from_db_assessment(query_row)
assessment.lighting_level = Lighting_Level.from_db_assessment(query_row)
assessment.location = Location.from_db_assessment(query_row)
assessment.user_handler = User.from_db_assessment(query_row)
return assessment
@classmethod
def from_db_distraction(cls, query_row):
_m = f'{cls.__qualname__}.from_db_distraction'
@@ -89,8 +98,8 @@ class Assessment(SQLAlchemy_ABC, Base):
assessment.id_assessment = query_row[1]
return assessment
@classmethod
def from_db_assessment_command_modality_link(cls, query_row):
_m = f'{cls.__qualname__}.from_db_assessment_command_modality_link'
def from_db_assessment_command_link(cls, query_row):
_m = f'{cls.__qualname__}.from_db_assessment_command_link'
assessment = cls()
assessment.id_assessment = query_row[1]
return assessment
@@ -101,12 +110,15 @@ class Assessment(SQLAlchemy_ABC, Base):
assessment = cls()
if json is None: return assessment
assessment.id_assessment = json.get(Assessment.ATTR_ID_ASSESSMENT, -1)
assessment.id_assessment_type = json[Assessment_Type.ATTR_ID_ASSESSMENT_TYPE]
assessment.id_weather = json[Weather.ATTR_ID_WEATHER]
assessment.id_lighting_level = json[Lighting_Level.ATTR_ID_LIGHTING_LEVEL]
assessment.id_location = json[Location.ATTR_ID_LOCATION]
assessment.id_user_handler = json[cls.FLAG_USER_HANDLER]
assessment.notes = json[cls.FLAG_NOTES]
assessment.temperature_celcius = json[cls.FLAG_TEMPERATURE_CELCIUS]
assessment.start_on = json[cls.FLAG_START_ON]
assessment.end_on = json[cls.FLAG_END_ON]
assessment.active = av.input_bool(json[cls.FLAG_ACTIVE], cls.FLAG_ACTIVE, _m)
assessment.created_on = json.get(cls.FLAG_CREATED_ON, None)
return assessment
@@ -115,17 +127,20 @@ class Assessment(SQLAlchemy_ABC, Base):
as_json = {
**self.get_shared_json_attributes(self)
, self.ATTR_ID_ASSESSMENT: self.id_assessment
, Assessment_Type.ATTR_ID_ASSESSMENT_TYPE: self.id_assessment_type
, Weather.ATTR_ID_WEATHER: { Weather.ATTR_ID_WEATHER: None } if self.weather is None else self.weather.to_json()
, Lighting_Level.ATTR_ID_LIGHTING_LEVEL: { Lighting_Level.ATTR_ID_LIGHTING_LEVEL: None } if self.lighting_level is None else self.lighting_level.to_json()
, Location.ATTR_ID_LOCATION: { Location.ATTR_ID_LOCATION: None } if self.weather is None else self.weather.to_json()
, self.FLAG_USER_HANDLER: { User.ATTR_ID_USER: None } if self.user_handler is None else self.user_handler.to_json()
, self.FLAG_NOTES: self.notes
, self.FLAG_TEMPERATURE_CELCIUS: self.temperature_celcius
, self.FLAG_START_ON: self.start_on
, self.FLAG_END_ON: self.end_on
, self.FLAG_ACTIVE: self.active
, self.FLAG_CREATED_ON: self.created_on
, self.FLAG_DISTRACTION: [distraction.to_json() for distraction in self.distractions] if (self.distractions is not None and len(self.distractions) > 0) else []
, self.FLAG_ASSESSMENT_COMMAND_MODALITY_LINK: [link.to_json() for link in self.assessment_command_modality_links] if (self.assessment_command_modality_links is not None and len(self.assessment_command_modality_links) > 0) else []
, self.FLAG_ASSESSMENT_COMMAND_LINK: [link.to_json() for link in self.assessment_command_links] if (self.assessment_command_links is not None and len(self.assessment_command_links) > 0) else []
}
return as_json
@@ -133,12 +148,15 @@ class Assessment(SQLAlchemy_ABC, Base):
return f'''
{self.__class__.__name__}(
{self.FLAG_ASSESSMENT}: {self.id_assessment}
{Assessment_Type.FLAG_ASSESSMENT_TYPE}: {self.assessment_type}
{Weather.FLAG_WEATHER}: {self.weather}
{Lighting_Level.FLAG_LIGHTING_LEVEL}: {self.lighting_level}
{Location.FLAG_LOCATION}: {self.location}
{self.FLAG_USER_HANDLER}: {self.user_handler}
{self.FLAG_NOTES}: {self.notes}
{self.FLAG_TEMPERATURE_CELCIUS}: {self.temperature_celcius}
{self.FLAG_START_ON}: {self.start_on}
{self.FLAG_END_ON}: {self.end_on}
{self.FLAG_ACTIVE}: {self.active}
{self.FLAG_CREATED_ON}: {self.created_on}
)
@@ -150,6 +168,7 @@ class Assessment_Temp(db.Model, Base):
__table_args__ = { 'extend_existing': True }
id_temp = db.Column(db.Integer, primary_key=True)
id_assessment = db.Column(db.Integer)
id_assessment_type = db.Column(db.Integer)
id_weather = db.Column(db.Integer)
id_lighting_level = db.Column(db.Integer)
id_location = db.Column(db.Integer)
@@ -157,6 +176,8 @@ class Assessment_Temp(db.Model, Base):
notes = db.Column(db.Text)
temperature_celcius = db.Column(db.Numeric(5, 2))
# difficulty_level = db.Column(db.Float)
start_on = db.Column(db.DateTime)
end_on = db.Column(db.DateTime)
active = db.Column(db.Boolean)
# created_on = db.Column(db.DateTime)
guid: str = db.Column(db.String(36))
@@ -169,12 +190,15 @@ class Assessment_Temp(db.Model, Base):
_m = 'Assessment_Temp.from_assessment'
temp = cls()
temp.id_assessment = assessment.id_assessment
temp.id_assessment_type = assessment.id_assessment_type
temp.id_weather = assessment.id_weather
temp.id_lighting_level = assessment.id_lighting_level
temp.id_location = assessment.id_location
temp.id_user_handler = assessment.id_user_handler
temp.notes = assessment.notes
temp.temperature_celcius = assessment.temperature_celcius
temp.start_on = assessment.start_on
temp.end_on = assessment.end_on
temp.active = assessment.active
# temp.created_on = assessment.created_on
return temp
@@ -187,6 +211,10 @@ class Parameters_Assessment(Get_Many_Parameters_Base):
notes_assessment: str
min_temperature_assessment: Optional[float]
max_temperature_assessment: Optional[float]
get_all_assessment_type: bool
get_inactive_assessment_type: bool
ids_assessment_type: str
names_assessment_type: str
get_all_weather: bool
get_inactive_weather: bool
ids_weather: str
@@ -219,6 +247,10 @@ class Parameters_Assessment(Get_Many_Parameters_Base):
, notes_assessment = ''
, min_temperature_assessment = None
, max_temperature_assessment = None
, get_all_assessment_type = True
, get_inactive_assessment_type = False
, ids_assessment_type = ''
, names_assessment_type = ''
, get_all_weather = True
, get_inactive_weather = False
, ids_weather = ''
@@ -252,6 +284,10 @@ class Parameters_Assessment(Get_Many_Parameters_Base):
, notes_assessment = json.get('a_notes_assessment', '')
, min_temperature_assessment = json.get('a_min_temperature_assessment', None)
, max_temperature_assessment = json.get('a_max_temperature_assessment', None)
, get_all_assessment_type = json.get('a_get_all_assessment_type', False)
, get_inactive_assessment_type = json.get('a_get_inactive_assessment_type', False)
, ids_assessment_type = json.get('a_ids_assessment_type', '')
, names_assessment_type = json.get('a_names_assessment_type', '')
, get_all_weather = json.get('a_get_all_weather', False)
, get_inactive_weather = json.get('a_get_inactive_weather', False)
, ids_weather = json.get('a_ids_weather', '')
@@ -281,6 +317,7 @@ class Parameters_Assessment(Get_Many_Parameters_Base):
_m = f'{cls.__qualname__}.from_form_filters_assessment'
av.val_instance(form, 'form', _m, Filters_Assessment)
has_filter_search_text = not (form.search.data == '' or form.search.data is None)
has_filter_assessment_type = not (form.id_assessment_type.data == '0' or form.id_assessment_type.data == '' or form.id_assessment_type.data is None)
has_filter_weather = not (form.id_weather.data == '0' or form.id_weather.data == '' or form.id_weather.data is None)
has_filter_lighting_level = not (form.id_lighting_level.data == '0' or form.id_lighting_level.data == '' or form.id_lighting_level.data is None)
has_filter_location = not (form.id_location.data == '0' or form.id_location.data == '' or form.id_location.data is None)
@@ -291,6 +328,10 @@ class Parameters_Assessment(Get_Many_Parameters_Base):
filters.get_all_assessment = True
filters.get_inactive_assessment = not active_only
filters.ids_assessment = ''
filters.get_all_assessment_type = not has_filter_assessment_type
filters.get_inactive_assessment_type = not active_only
filters.ids_assessment_type = form.id_assessment_type if has_filter_assessment_type else ''
filters.names_assessment_type = form.search.data if has_filter_search_text else ''
filters.get_all_weather = not has_filter_weather
filters.get_inactive_weather = not active_only
filters.ids_weather = form.id_weather.data if has_filter_weather else ''
@@ -319,6 +360,10 @@ class Parameters_Assessment(Get_Many_Parameters_Base):
, 'a_notes_assessment': self.notes_assessment
, 'a_min_temperature_assessment': self.min_temperature_assessment
, 'a_max_temperature_assessment': self.max_temperature_assessment
, 'a_get_all_assessment_type': self.get_all_assessment_type
, 'a_get_inactive_assessment_type': self.get_inactive_assessment_type
, 'a_ids_assessment_type': self.ids_assessment_type
, 'a_names_assessment_type': self.names_assessment_type
, 'get_all_weather': self.get_all_weather
, 'get_inactive_weather': self.get_inactive_weather
, 'ids_weather': self.ids_weather