diff --git a/memos/fixtures/patch_entity_metadata_response.json b/memos/fixtures/patch_entity_metadata_response.json index 065fc53..7b55cda 100644 --- a/memos/fixtures/patch_entity_metadata_response.json +++ b/memos/fixtures/patch_entity_metadata_response.json @@ -10,7 +10,7 @@ "library_id": 1, "metadata_entries": [ { - "data_type": "attribute", + "data_type": "text", "entity_id": 1, "id": 1, "key": "author", @@ -18,7 +18,7 @@ "value": "Jane Smith" }, { - "data_type": "attribute", + "data_type": "text", "entity_id": 1, "id": 2, "key": "year", diff --git a/memos/schemas.py b/memos/schemas.py index 763eb9a..2bc13ff 100644 --- a/memos/schemas.py +++ b/memos/schemas.py @@ -11,8 +11,8 @@ class MetadataSource(Enum): class MetadataType(Enum): - EXTRACONTENT = "extra_content" - ATTRIBUTE = "attribute" + JSON_DATA = "json" + TEXT_DATA = "text" class NewLibraryParam(BaseModel): diff --git a/memos/server.py b/memos/server.py index 13ae9c4..b327c61 100644 --- a/memos/server.py +++ b/memos/server.py @@ -98,7 +98,7 @@ def new_folder( return crud.add_folder(library_id=library.id, folder=folder, db=db) -async def trigger_webhooks(library, entity, request): +async def trigger_webhooks(library: Library, entity: Entity, request: Request): async with httpx.AsyncClient() as client: tasks = [] for plugin in library.plugins: @@ -110,7 +110,7 @@ async def trigger_webhooks(library, entity, request): ) task = client.post( plugin.webhook_url, - json={"entity": entity.model_dump(mode="json")}, + json=entity.model_dump(mode="json"), headers={"Location": location}, timeout=10.0, # Adding a timeout of 10 seconds ) diff --git a/memos/test_server.py b/memos/test_server.py index 508a9ee..a1fc276 100644 --- a/memos/test_server.py +++ b/memos/test_server.py @@ -474,7 +474,7 @@ def test_add_metadata_entry_to_entity_success(client): key="author", value="John Doe", source="plugin_generated", - data_type=MetadataType.ATTRIBUTE, + data_type=MetadataType.TEXT_DATA, ) update_entity_param = UpdateEntityParam(attrs=[metadata_entry]) @@ -530,13 +530,13 @@ def test_patch_entity_metadata_entries(client): "key": "author", "value": "Jane Smith", "source": "user_generated", - "data_type": MetadataType.ATTRIBUTE.value, + "data_type": MetadataType.TEXT_DATA.value, }, { "key": "year", "value": "2023", "source": "user_generated", - "data_type": MetadataType.ATTRIBUTE.value, + "data_type": MetadataType.TEXT_DATA.value, }, ] update_entity_param = UpdateEntityParam( @@ -563,7 +563,7 @@ def test_patch_entity_metadata_entries(client): "key": "author", "value": "John Doe", "source": "user_generated", - "data_type": MetadataType.ATTRIBUTE.value, + "data_type": MetadataType.TEXT_DATA.value, } ] update_entity_param = UpdateEntityMetadataParam( @@ -594,7 +594,7 @@ def test_patch_entity_metadata_entries(client): "key": "media_type", "value": "book", "source": "user_generated", - "data_type": MetadataType.ATTRIBUTE.value, + "data_type": MetadataType.TEXT_DATA.value, } updated_metadata_entries.append(new_metadata_entry)