From 6a393acd265cb397b803d75b4552f9d74c1b7326 Mon Sep 17 00:00:00 2001 From: Mikhail Epifanov Date: Thu, 11 Jan 2024 22:35:58 +0100 Subject: [PATCH] redo migration. cleanup commented out code --- .gitignore | 2 +- cookbook/connectors/connector.py | 24 +------------- cookbook/connectors/connector_manager.py | 18 ---------- ...ing_list_entry_created_enabled_and_more.py | 33 ------------------- ...tconfig.py => 0208_homeassistantconfig.py} | 10 ++++-- 5 files changed, 9 insertions(+), 78 deletions(-) delete mode 100644 cookbook/migrations/0207_homeassistantconfig_on_shopping_list_entry_created_enabled_and_more.py rename cookbook/migrations/{0206_alter_storage_path_homeassistantconfig.py => 0208_homeassistantconfig.py} (63%) diff --git a/.gitignore b/.gitignore index 553403a5..4c8df7a7 100644 --- a/.gitignore +++ b/.gitignore @@ -54,7 +54,7 @@ docs/_build/ target/ \.idea/dataSources/ - +.idea \.idea/dataSources\.xml \.idea/dataSources\.local\.xml diff --git a/cookbook/connectors/connector.py b/cookbook/connectors/connector.py index d2a435d7..f97905b9 100644 --- a/cookbook/connectors/connector.py +++ b/cookbook/connectors/connector.py @@ -16,26 +16,4 @@ class Connector(ABC): async def on_shopping_list_entry_deleted(self, space: Space, instance: ShoppingListEntry) -> None: pass - # @abstractmethod - # def on_recipe_created(self, instance: Recipe, **kwargs) -> None: - # pass - # - # @abstractmethod - # def on_recipe_updated(self, instance: Recipe, **kwargs) -> None: - # pass - # - # @abstractmethod - # def on_recipe_deleted(self, instance: Recipe, **kwargs) -> None: - # pass - # - # @abstractmethod - # def on_meal_plan_created(self, instance: MealPlan, **kwargs) -> None: - # pass - # - # @abstractmethod - # def on_meal_plan_updated(self, instance: MealPlan, **kwargs) -> None: - # pass - # - # @abstractmethod - # def on_meal_plan_deleted(self, instance: MealPlan, **kwargs) -> None: - # pass + # TODO: Add Recipes & possibly Meal Place listeners/hooks (And maybe more?) diff --git a/cookbook/connectors/connector_manager.py b/cookbook/connectors/connector_manager.py index 0d3df8cf..93fa637d 100644 --- a/cookbook/connectors/connector_manager.py +++ b/cookbook/connectors/connector_manager.py @@ -19,7 +19,6 @@ class ActionType(Enum): class ConnectorManager: _connectors: Dict[str, List[Connector]] _listening_to_classes: UnionType = ShoppingListEntry | Recipe | MealPlan | Connector - max_concurrent_tasks = 2 def __init__(self): self._connectors = dict() @@ -79,20 +78,3 @@ class ConnectorManager: await asyncio.gather(*tasks, return_exceptions=False) except BaseException as e: print("received an exception from one of the tasks: ", e) - # if isinstance(instance, Recipe): - # if "created" in kwargs and kwargs["created"]: - # for connector in self._connectors: - # connector.on_recipe_created(instance, **kwargs) - # return - # for connector in self._connectors: - # connector.on_recipe_updated(instance, **kwargs) - # return - # - # if isinstance(instance, MealPlan): - # if "created" in kwargs and kwargs["created"]: - # for connector in self._connectors: - # connector.on_meal_plan_created(instance, **kwargs) - # return - # for connector in self._connectors: - # connector.on_meal_plan_updated(instance, **kwargs) - # return diff --git a/cookbook/migrations/0207_homeassistantconfig_on_shopping_list_entry_created_enabled_and_more.py b/cookbook/migrations/0207_homeassistantconfig_on_shopping_list_entry_created_enabled_and_more.py deleted file mode 100644 index 67f93b18..00000000 --- a/cookbook/migrations/0207_homeassistantconfig_on_shopping_list_entry_created_enabled_and_more.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 4.2.7 on 2024-01-11 19:53 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cookbook', '0206_alter_storage_path_homeassistantconfig'), - ] - - operations = [ - migrations.AddField( - model_name='homeassistantconfig', - name='on_shopping_list_entry_created_enabled', - field=models.BooleanField(default=False, help_text='Enable syncing ShoppingListEntry to Homeassistant Todo List'), - ), - migrations.AddField( - model_name='homeassistantconfig', - name='on_shopping_list_entry_deleted_enabled', - field=models.BooleanField(default=False, help_text='Enable syncing ShoppingListEntry deletion to Homeassistant Todo List'), - ), - migrations.AddField( - model_name='homeassistantconfig', - name='on_shopping_list_entry_updated_enabled', - field=models.BooleanField(default=False, help_text='PLACEHOLDER'), - ), - migrations.AlterField( - model_name='homeassistantconfig', - name='url', - field=models.URLField(blank=True), - ), - ] diff --git a/cookbook/migrations/0206_alter_storage_path_homeassistantconfig.py b/cookbook/migrations/0208_homeassistantconfig.py similarity index 63% rename from cookbook/migrations/0206_alter_storage_path_homeassistantconfig.py rename to cookbook/migrations/0208_homeassistantconfig.py index acbec237..6eca066f 100644 --- a/cookbook/migrations/0206_alter_storage_path_homeassistantconfig.py +++ b/cookbook/migrations/0208_homeassistantconfig.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.7 on 2024-01-10 21:28 +# Generated by Django 4.2.7 on 2024-01-11 21:34 import cookbook.models from django.conf import settings @@ -8,9 +8,10 @@ import django.db.models.deletion class Migration(migrations.Migration): + dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('cookbook', '0205_alter_food_fdc_id_alter_propertytype_fdc_id'), + ('cookbook', '0207_space_logo_color_128_space_logo_color_144_and_more'), ] operations = [ @@ -19,9 +20,12 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=128, validators=[django.core.validators.MinLengthValidator(1)])), - ('url', models.URLField(blank=True, help_text='Something like http://homeassistant:8123/api')), + ('url', models.URLField(blank=True)), ('token', models.CharField(blank=True, max_length=512)), ('todo_entity', models.CharField(default='todo.shopping_list', max_length=128)), + ('on_shopping_list_entry_created_enabled', models.BooleanField(default=False, help_text='Enable syncing ShoppingListEntry to Homeassistant Todo List')), + ('on_shopping_list_entry_updated_enabled', models.BooleanField(default=False, help_text='PLACEHOLDER')), + ('on_shopping_list_entry_deleted_enabled', models.BooleanField(default=False, help_text='Enable syncing ShoppingListEntry deletion to Homeassistant Todo List')), ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), ('space', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.space')), ],