diff --git a/osxphotos/_version.py b/osxphotos/_version.py index e910e13d..7bd3c85c 100644 --- a/osxphotos/_version.py +++ b/osxphotos/_version.py @@ -1,3 +1,3 @@ """ version info """ -__version__ = "0.39.25" +__version__ = "0.40.00" diff --git a/osxphotos/templates/xmp_sidecar.mako b/osxphotos/templates/xmp_sidecar.mako index 1eff48eb..70fc362a 100644 --- a/osxphotos/templates/xmp_sidecar.mako +++ b/osxphotos/templates/xmp_sidecar.mako @@ -1,5 +1,3 @@ - - <%def name="photoshop_sidecar_for_extension(extension)"> % if extension is None: @@ -18,7 +16,7 @@ % else: - ${desc | x} + ${desc | x} % endif @@ -45,7 +43,7 @@ % for subj in subject: - ${subj | x} + ${subj | x} % endfor @@ -61,11 +59,11 @@ <%def name="iptc_personinimage(persons)"> % if persons: - - % for person in persons: - ${person | x} - % endfor - + + % for person in persons: + ${person | x} + % endfor + % endif @@ -73,11 +71,11 @@ <%def name="dk_tagslist(keywords)"> % if keywords: - - % for keyword in keywords: - ${keyword | x} - % endfor - + + % for keyword in keywords: + ${keyword | x} + % endfor + % endif @@ -101,33 +99,112 @@ % endif - - - - ${photoshop_sidecar_for_extension(extension)} - ${dc_description(description)} - ${dc_title(photo.title)} - ${dc_subject(subjects)} - ${dc_datecreated(photo.date)} - - - ${iptc_personinimage(persons)} - - - ${dk_tagslist(keywords)} - - - ${adobe_createdate(photo.date)} - ${adobe_modifydate(photo.date)} - - - ${gps_info(*photo.location)} - - - \ No newline at end of file +<%def name="orientation(orientation)"> + % if orientation is not None: + ${orientation} + % endif + + +<%def name="mwg_face_regions(photo)"> + % if photo.face_info: + + + pixel + + + + % for face in photo.face_info: + + + ${'{0:.6f}'.format(face.mwg_rs_area.h)} + ${'{0:.6f}'.format(face.mwg_rs_area.w)} + ${'{0:.6f}'.format(face.mwg_rs_area.x)} + ${'{0:.6f}'.format(face.mwg_rs_area.y)} + normalized + + ${face.name} + ${face.roll} + Face + + % endfor + + + + % endif + + +<%def name="mpri_face_regions(photo)"> + % if photo.face_info: + + + + % for face in photo.face_info: + + ${face.name} + ${'{0:.6f}'.format(face.mpri_reg_rect.x)}, ${'{0:.6f}'.format(face.mpri_reg_rect.y)}, ${'{0:.6f}'.format(face.mpri_reg_rect.h)}, ${'{0:.6f}'.format(face.mpri_reg_rect.w)} + + % endfor + + + + % endif + + + + + + + + ${photoshop_sidecar_for_extension(extension)} + ${dc_description(description)} + ${dc_title(photo.title)} + ${dc_subject(subjects)} + ${dc_datecreated(photo.date)} + + + + ${iptc_personinimage(persons)} + + + + ${dk_tagslist(keywords)} + + + + ${adobe_createdate(photo.date)} + ${adobe_modifydate(photo.date)} + + + + ${gps_info(*photo.location)} + + + + ${orientation(photo.orientation)} + + + + ${mwg_face_regions(photo)} + + + + + ${mpri_face_regions(photo)} + + + + + \ No newline at end of file diff --git a/tests/Test-Faces-10.15.6.photoslibrary/database/Photos.sqlite-wal b/tests/Test-Faces-10.15.6.photoslibrary/database/Photos.sqlite-wal deleted file mode 100644 index 4d687850..00000000 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/database/Photos.sqlite-wal and /dev/null differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/database/search/synonymsProcess.plist b/tests/Test-Faces-10.15.6.photoslibrary/database/search/synonymsProcess.plist deleted file mode 100644 index 1312ad4d..00000000 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/database/search/synonymsProcess.plist and /dev/null differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/database/search/zeroKeywords.data b/tests/Test-Faces-10.15.6.photoslibrary/database/search/zeroKeywords.data deleted file mode 100644 index 7195d165..00000000 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/database/search/zeroKeywords.data and /dev/null differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-wal b/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-wal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal b/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal b/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal deleted file mode 100644 index 284d1439..00000000 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal and /dev/null differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGSearchComputationCache.plist b/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGSearchComputationCache.plist deleted file mode 100644 index d7abf398..00000000 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGSearchComputationCache.plist and /dev/null differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist b/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist deleted file mode 100644 index 6f01b31e..00000000 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist and /dev/null differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Asset-change.plj b/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Asset-change.plj deleted file mode 100644 index 8410ebdc..00000000 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Asset-change.plj and /dev/null differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/HistoryToken.plist b/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/HistoryToken.plist deleted file mode 100644 index a5747b2e..00000000 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/HistoryToken.plist and /dev/null differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/database/DataModelVersion.plist b/tests/Test-Faces-10.15.7.photoslibrary/database/DataModelVersion.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/database/DataModelVersion.plist rename to tests/Test-Faces-10.15.7.photoslibrary/database/DataModelVersion.plist diff --git a/tests/Test-Faces-10.15.6.photoslibrary/database/Photos.sqlite b/tests/Test-Faces-10.15.7.photoslibrary/database/Photos.sqlite similarity index 92% rename from tests/Test-Faces-10.15.6.photoslibrary/database/Photos.sqlite rename to tests/Test-Faces-10.15.7.photoslibrary/database/Photos.sqlite index 42a21193..a560b401 100644 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/database/Photos.sqlite and b/tests/Test-Faces-10.15.7.photoslibrary/database/Photos.sqlite differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/database/Photos.sqlite-shm b/tests/Test-Faces-10.15.7.photoslibrary/database/Photos.sqlite-shm new file mode 100644 index 00000000..3480090c Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/database/Photos.sqlite-shm differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/database/Photos.sqlite-wal b/tests/Test-Faces-10.15.7.photoslibrary/database/Photos.sqlite-wal new file mode 100644 index 00000000..21b9c303 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/database/Photos.sqlite-wal differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/database/Photos.sqlite.lock b/tests/Test-Faces-10.15.7.photoslibrary/database/Photos.sqlite.lock similarity index 94% rename from tests/Test-Faces-10.15.6.photoslibrary/database/Photos.sqlite.lock rename to tests/Test-Faces-10.15.7.photoslibrary/database/Photos.sqlite.lock index 7b76921e..870673e0 100644 --- a/tests/Test-Faces-10.15.6.photoslibrary/database/Photos.sqlite.lock +++ b/tests/Test-Faces-10.15.7.photoslibrary/database/Photos.sqlite.lock @@ -7,7 +7,7 @@ hostuuid 9575E48B-8D5F-5654-ABAC-4431B1167324 pid - 440 + 3447 processname photolibraryd uid diff --git a/tests/Test-Faces-10.15.6.photoslibrary/database/metaSchema.db b/tests/Test-Faces-10.15.7.photoslibrary/database/metaSchema.db similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/database/metaSchema.db rename to tests/Test-Faces-10.15.7.photoslibrary/database/metaSchema.db diff --git a/tests/Test-Faces-10.15.6.photoslibrary/database/photos.db b/tests/Test-Faces-10.15.7.photoslibrary/database/photos.db similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/database/photos.db rename to tests/Test-Faces-10.15.7.photoslibrary/database/photos.db diff --git a/tests/Test-Faces-10.15.6.photoslibrary/database/protection b/tests/Test-Faces-10.15.7.photoslibrary/database/protection similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/database/protection rename to tests/Test-Faces-10.15.7.photoslibrary/database/protection diff --git a/tests/Test-Faces-10.15.6.photoslibrary/database/search/graphDataProgress.plist b/tests/Test-Faces-10.15.7.photoslibrary/database/search/graphDataProgress.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/database/search/graphDataProgress.plist rename to tests/Test-Faces-10.15.7.photoslibrary/database/search/graphDataProgress.plist diff --git a/tests/Test-Faces-10.15.6.photoslibrary/database/search/psi.sqlite b/tests/Test-Faces-10.15.7.photoslibrary/database/search/psi.sqlite similarity index 77% rename from tests/Test-Faces-10.15.6.photoslibrary/database/search/psi.sqlite rename to tests/Test-Faces-10.15.7.photoslibrary/database/search/psi.sqlite index 0881f9bd..849e9d2c 100644 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/database/search/psi.sqlite and b/tests/Test-Faces-10.15.7.photoslibrary/database/search/psi.sqlite differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/database/search/psi.sqlite-shm b/tests/Test-Faces-10.15.7.photoslibrary/database/search/psi.sqlite-shm similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/database/search/psi.sqlite-shm rename to tests/Test-Faces-10.15.7.photoslibrary/database/search/psi.sqlite-shm diff --git a/tests/Test-Faces-10.15.6.photoslibrary/database/search/psi.sqlite-wal b/tests/Test-Faces-10.15.7.photoslibrary/database/search/psi.sqlite-wal similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/database/search/psi.sqlite-wal rename to tests/Test-Faces-10.15.7.photoslibrary/database/search/psi.sqlite-wal diff --git a/tests/Test-Faces-10.15.6.photoslibrary/database/search/searchMetadata.plist b/tests/Test-Faces-10.15.7.photoslibrary/database/search/searchMetadata.plist similarity index 98% rename from tests/Test-Faces-10.15.6.photoslibrary/database/search/searchMetadata.plist rename to tests/Test-Faces-10.15.7.photoslibrary/database/search/searchMetadata.plist index 89aa2a1d..3eec4180 100644 --- a/tests/Test-Faces-10.15.6.photoslibrary/database/search/searchMetadata.plist +++ b/tests/Test-Faces-10.15.7.photoslibrary/database/search/searchMetadata.plist @@ -4,6 +4,8 @@ BlacklistedMeaningsByMeaning + MePersonUUID + 39488755-78C0-40B2-B378-EDA280E1823C SceneWhitelist Graduation diff --git a/tests/Test-Faces-10.15.6.photoslibrary/database/search/searchProgress.plist b/tests/Test-Faces-10.15.7.photoslibrary/database/search/searchProgress.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/database/search/searchProgress.plist rename to tests/Test-Faces-10.15.7.photoslibrary/database/search/searchProgress.plist diff --git a/tests/Test-Faces-10.15.6.photoslibrary/database/search/searchSystemInfo.plist b/tests/Test-Faces-10.15.7.photoslibrary/database/search/searchSystemInfo.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/database/search/searchSystemInfo.plist rename to tests/Test-Faces-10.15.7.photoslibrary/database/search/searchSystemInfo.plist diff --git a/tests/Test-Faces-10.15.7.photoslibrary/database/search/synonymsProcess.plist b/tests/Test-Faces-10.15.7.photoslibrary/database/search/synonymsProcess.plist new file mode 100644 index 00000000..01457a86 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/database/search/synonymsProcess.plist differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/database/search/zeroKeywords.data b/tests/Test-Faces-10.15.7.photoslibrary/database/search/zeroKeywords.data new file mode 100644 index 00000000..67655061 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/database/search/zeroKeywords.data differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/originals/1/11639AAB-F5C3-46F8-9058-9C19AD726D00.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/1/11639AAB-F5C3-46F8-9058-9C19AD726D00.jpeg new file mode 100644 index 00000000..ea939edc Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/originals/1/11639AAB-F5C3-46F8-9058-9C19AD726D00.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/originals/2/21EF6CF1-7BA6-43CB-A6B8-597CA9C52E76.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/2/21EF6CF1-7BA6-43CB-A6B8-597CA9C52E76.jpeg new file mode 100644 index 00000000..c1fa3ce1 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/originals/2/21EF6CF1-7BA6-43CB-A6B8-597CA9C52E76.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/2/26011634-7F89-47DD-AA3B-A3693708E3F9.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/2/26011634-7F89-47DD-AA3B-A3693708E3F9.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/2/26011634-7F89-47DD-AA3B-A3693708E3F9.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/2/26011634-7F89-47DD-AA3B-A3693708E3F9.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/2/2C766B95-1D8C-40DA-AD8E-39798BF4576D.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/2/2C766B95-1D8C-40DA-AD8E-39798BF4576D.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/2/2C766B95-1D8C-40DA-AD8E-39798BF4576D.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/2/2C766B95-1D8C-40DA-AD8E-39798BF4576D.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/originals/3/3609084A-8A63-429D-A122-41F147F6D1BB.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/3/3609084A-8A63-429D-A122-41F147F6D1BB.jpeg new file mode 100644 index 00000000..9cbefc75 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/originals/3/3609084A-8A63-429D-A122-41F147F6D1BB.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/originals/3/399592DC-B764-4489-929A-4CD820E374C1.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/3/399592DC-B764-4489-929A-4CD820E374C1.jpeg new file mode 100644 index 00000000..db54ac84 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/originals/3/399592DC-B764-4489-929A-4CD820E374C1.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/4/41581532-858D-4767-ADA8-9D26C52FCB96.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/4/41581532-858D-4767-ADA8-9D26C52FCB96.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/4/41581532-858D-4767-ADA8-9D26C52FCB96.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/4/41581532-858D-4767-ADA8-9D26C52FCB96.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/originals/4/4736ED4D-B3DC-46EB-93F0-6481674753B1.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/4/4736ED4D-B3DC-46EB-93F0-6481674753B1.jpeg new file mode 100644 index 00000000..7ee998c9 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/originals/4/4736ED4D-B3DC-46EB-93F0-6481674753B1.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/originals/4/4B97B0B4-B5E4-42D2-821F-8926D8B9BEBA.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/4/4B97B0B4-B5E4-42D2-821F-8926D8B9BEBA.jpeg new file mode 100644 index 00000000..fd9de84f Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/originals/4/4B97B0B4-B5E4-42D2-821F-8926D8B9BEBA.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/originals/4/4BE91165-2DA2-438C-A768-C332BB3827B1.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/4/4BE91165-2DA2-438C-A768-C332BB3827B1.jpeg new file mode 100644 index 00000000..451cce17 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/originals/4/4BE91165-2DA2-438C-A768-C332BB3827B1.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/5/52E95CFC-DD9A-4B60-9FC4-FC8EA716DF38.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/5/52E95CFC-DD9A-4B60-9FC4-FC8EA716DF38.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/5/52E95CFC-DD9A-4B60-9FC4-FC8EA716DF38.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/5/52E95CFC-DD9A-4B60-9FC4-FC8EA716DF38.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/5/554B190D-B064-479F-89CB-EB2485C3675F.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/5/554B190D-B064-479F-89CB-EB2485C3675F.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/5/554B190D-B064-479F-89CB-EB2485C3675F.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/5/554B190D-B064-479F-89CB-EB2485C3675F.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/5/5E461935-2FE5-4762-80D3-FCF70739FFA0.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/5/5E461935-2FE5-4762-80D3-FCF70739FFA0.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/5/5E461935-2FE5-4762-80D3-FCF70739FFA0.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/5/5E461935-2FE5-4762-80D3-FCF70739FFA0.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/6/631629B3-8811-4D94-B3E1-751C06ED1D22.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/6/631629B3-8811-4D94-B3E1-751C06ED1D22.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/6/631629B3-8811-4D94-B3E1-751C06ED1D22.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/6/631629B3-8811-4D94-B3E1-751C06ED1D22.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/6/660AF0C1-169A-46BD-907B-D259527162BE.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/6/660AF0C1-169A-46BD-907B-D259527162BE.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/6/660AF0C1-169A-46BD-907B-D259527162BE.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/6/660AF0C1-169A-46BD-907B-D259527162BE.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/originals/6/687A4CF6-380A-4B6F-A105-7DA04CF72CFD.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/6/687A4CF6-380A-4B6F-A105-7DA04CF72CFD.jpeg new file mode 100644 index 00000000..ae1f89d5 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/originals/6/687A4CF6-380A-4B6F-A105-7DA04CF72CFD.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/7/74A8D2AD-4A95-402C-AB41-8948B6268DDE.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/7/74A8D2AD-4A95-402C-AB41-8948B6268DDE.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/7/74A8D2AD-4A95-402C-AB41-8948B6268DDE.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/7/74A8D2AD-4A95-402C-AB41-8948B6268DDE.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/7/74C3C5B5-F9EB-4527-A03F-8064B1496542.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/7/74C3C5B5-F9EB-4527-A03F-8064B1496542.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/7/74C3C5B5-F9EB-4527-A03F-8064B1496542.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/7/74C3C5B5-F9EB-4527-A03F-8064B1496542.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/originals/7/75DCDF37-A924-4280-BEC7-A5EC6EFE6016.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/7/75DCDF37-A924-4280-BEC7-A5EC6EFE6016.jpeg new file mode 100644 index 00000000..0d50776c Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/originals/7/75DCDF37-A924-4280-BEC7-A5EC6EFE6016.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/originals/7/77BD401F-4308-47A5-BA28-3369FAAFEBE2.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/7/77BD401F-4308-47A5-BA28-3369FAAFEBE2.jpeg new file mode 100644 index 00000000..51fd831a Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/originals/7/77BD401F-4308-47A5-BA28-3369FAAFEBE2.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/originals/7/79096F62-C8E9-4652-85A0-D77C972FDFDF.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/7/79096F62-C8E9-4652-85A0-D77C972FDFDF.jpeg new file mode 100644 index 00000000..cf85727a Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/originals/7/79096F62-C8E9-4652-85A0-D77C972FDFDF.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/originals/8/80080A31-77A1-4984-8E51-E7466D9B9F34.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/8/80080A31-77A1-4984-8E51-E7466D9B9F34.jpeg new file mode 100644 index 00000000..f75cf0fc Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/originals/8/80080A31-77A1-4984-8E51-E7466D9B9F34.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/8/82B6F7FA-C552-4A91-9150-372EF3437FDC.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/8/82B6F7FA-C552-4A91-9150-372EF3437FDC.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/8/82B6F7FA-C552-4A91-9150-372EF3437FDC.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/8/82B6F7FA-C552-4A91-9150-372EF3437FDC.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/8/8C5431B3-5F59-4B5F-855A-021408C519E4.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/8/8C5431B3-5F59-4B5F-855A-021408C519E4.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/8/8C5431B3-5F59-4B5F-855A-021408C519E4.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/8/8C5431B3-5F59-4B5F-855A-021408C519E4.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/9/916732EA-E357-47E7-894C-DB0692F24327.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/9/916732EA-E357-47E7-894C-DB0692F24327.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/9/916732EA-E357-47E7-894C-DB0692F24327.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/9/916732EA-E357-47E7-894C-DB0692F24327.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/9/94D0440B-28BD-4724-89BD-A53662F57CC6.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/9/94D0440B-28BD-4724-89BD-A53662F57CC6.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/9/94D0440B-28BD-4724-89BD-A53662F57CC6.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/9/94D0440B-28BD-4724-89BD-A53662F57CC6.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/9/9E7D89FF-05C0-415E-BA48-1B3AE8A8A910.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/9/9E7D89FF-05C0-415E-BA48-1B3AE8A8A910.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/9/9E7D89FF-05C0-415E-BA48-1B3AE8A8A910.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/9/9E7D89FF-05C0-415E-BA48-1B3AE8A8A910.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/A/A2E762C9-F2A2-4806-9684-D1A78910B71E.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/A/A2E762C9-F2A2-4806-9684-D1A78910B71E.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/A/A2E762C9-F2A2-4806-9684-D1A78910B71E.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/A/A2E762C9-F2A2-4806-9684-D1A78910B71E.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/originals/A/A478D042-FA26-4863-8E6F-EE749F4710E5.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/A/A478D042-FA26-4863-8E6F-EE749F4710E5.jpeg new file mode 100644 index 00000000..a68c8eba Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/originals/A/A478D042-FA26-4863-8E6F-EE749F4710E5.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/originals/B/B0757DA2-0D67-4991-980E-E935C4790827.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/B/B0757DA2-0D67-4991-980E-E935C4790827.jpeg new file mode 100644 index 00000000..4a744d71 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/originals/B/B0757DA2-0D67-4991-980E-E935C4790827.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/originals/B/B507D754-0C5D-4CDF-BAE4-2257292CA28A.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/B/B507D754-0C5D-4CDF-BAE4-2257292CA28A.jpeg new file mode 100644 index 00000000..bb735a68 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/originals/B/B507D754-0C5D-4CDF-BAE4-2257292CA28A.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/C/C36C837E-338D-40D5-B151-0AE3171DEF52.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/C/C36C837E-338D-40D5-B151-0AE3171DEF52.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/C/C36C837E-338D-40D5-B151-0AE3171DEF52.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/C/C36C837E-338D-40D5-B151-0AE3171DEF52.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/originals/C/C3BE45BB-F9E8-46C2-88FF-EB6A8E445A31.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/C/C3BE45BB-F9E8-46C2-88FF-EB6A8E445A31.jpeg new file mode 100644 index 00000000..79867c67 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/originals/C/C3BE45BB-F9E8-46C2-88FF-EB6A8E445A31.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/originals/C/C547648F-B778-43B5-B12B-4338B7377D09.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/C/C547648F-B778-43B5-B12B-4338B7377D09.jpeg new file mode 100644 index 00000000..c5ca0c7b Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/originals/C/C547648F-B778-43B5-B12B-4338B7377D09.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/D/D615DA33-90CD-4F69-A216-496F3D983539.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/D/D615DA33-90CD-4F69-A216-496F3D983539.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/D/D615DA33-90CD-4F69-A216-496F3D983539.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/D/D615DA33-90CD-4F69-A216-496F3D983539.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/originals/E/E2930419-BEFD-4590-BC44-03E48466459D.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/E/E2930419-BEFD-4590-BC44-03E48466459D.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/originals/E/E2930419-BEFD-4590-BC44-03E48466459D.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/originals/E/E2930419-BEFD-4590-BC44-03E48466459D.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/originals/E/E7B8ED9C-314E-4459-895D-6BDC6B7D8F6C.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/originals/E/E7B8ED9C-314E-4459-895D-6BDC6B7D8F6C.jpeg new file mode 100644 index 00000000..b8fb6389 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/originals/E/E7B8ED9C-314E-4459-895D-6BDC6B7D8F6C.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.Photos/appPrivateData.plist b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.Photos/appPrivateData.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.Photos/appPrivateData.plist rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.Photos/appPrivateData.plist diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db-shm b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db-shm similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db-shm rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db-shm diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db-wal b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db-wal similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db-wal rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db-wal diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-shm b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-shm similarity index 96% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-shm rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-shm index 377765dc..bf06e4d7 100644 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-shm and b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-shm differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-wal similarity index 55% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-wal index 556dd77f..8e89f8f4 100644 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal and b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-wal differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb-shm b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-shm similarity index 95% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb-shm rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-shm index cb7e0bdc..3ad5919c 100644 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb-shm and b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-shm differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-wal b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-wal similarity index 82% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-wal rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-wal index 48f67fe0..084cb5fd 100644 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-wal and b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-wal differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm similarity index 97% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm index fe9ac284..8d0f28cc 100644 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm and b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/database/Photos.sqlite-shm b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal similarity index 78% rename from tests/Test-Faces-10.15.6.photoslibrary/database/Photos.sqlite-shm rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal index d3d11d1d..0d63bdfc 100644 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/database/Photos.sqlite-shm and b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm similarity index 92% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm index 12d8ef39..9ec0865c 100644 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm and b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal new file mode 100644 index 00000000..5959d7e0 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-shm b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-shm similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-shm rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-shm diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-wal b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-wal similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-wal rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-wal diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-shm b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-shm similarity index 97% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-shm rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-shm index d4ab470c..67c9bdae 100644 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-shm and b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-shm differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-wal b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-wal similarity index 51% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-wal rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-wal index 51c0408f..5db00645 100644 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-wal and b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-wal differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm similarity index 97% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm index 2105441d..0d05ead7 100644 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm and b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-wal b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-wal similarity index 59% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-wal rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-wal index 2adeb6b5..afb0e9a0 100644 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-wal and b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-wal differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm similarity index 94% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm index 2c7c5d71..5934a3b0 100644 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm and b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal new file mode 100644 index 00000000..e97f877d Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGSearchComputationCache.plist b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGSearchComputationCache.plist new file mode 100644 index 00000000..3e6bb769 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGSearchComputationCache.plist differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGSharingFeatureExtractorRecords.plist b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGSharingFeatureExtractorRecords.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGSharingFeatureExtractorRecords.plist rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGSharingFeatureExtractorRecords.plist diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist similarity index 72% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist index 838cd575..42bf2d62 100644 --- a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist +++ b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist @@ -3,24 +3,24 @@ BackgroundHighlightCollection - 2020-07-27T00:34:02Z + 2021-01-20T14:38:44Z BackgroundHighlightEnrichment - 2020-07-27T00:34:02Z + 2021-01-20T14:38:44Z BackgroundJobAssetRevGeocode - 2020-07-27T01:57:21Z + 2021-01-20T14:38:44Z BackgroundJobSearch - 2020-07-27T00:34:02Z + 2021-01-20T14:38:44Z BackgroundPeopleSuggestion - 2020-07-27T00:34:02Z + 2021-01-20T14:38:43Z BackgroundUserBehaviorProcessor - 2020-07-26T14:34:46Z + 2021-01-20T14:38:44Z PhotoAnalysisGraphLastBackgroundGraphConsistencyUpdateJobDateKey 2020-07-27T00:01:51Z PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate 2020-07-26T14:34:45Z PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate - 2020-07-27T01:57:22Z + 2021-01-20T14:38:45Z SiriPortraitDonation - 2020-07-26T14:34:46Z + 2021-01-20T14:38:44Z diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/construction-photosgraph.kgdb b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/construction-photosgraph.kgdb similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/construction-photosgraph.kgdb rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/construction-photosgraph.kgdb diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/construction-photosgraph.kgdb-shm b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/construction-photosgraph.kgdb-shm similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/construction-photosgraph.kgdb-shm rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/construction-photosgraph.kgdb-shm diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/construction-photosgraph.kgdb-wal b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/construction-photosgraph.kgdb-wal similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/construction-photosgraph.kgdb-wal rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/construction-photosgraph.kgdb-wal diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/liveupdate-photosgraph.kgdb b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/liveupdate-photosgraph.kgdb similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/liveupdate-photosgraph.kgdb rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/liveupdate-photosgraph.kgdb diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/liveupdate-photosgraph.kgdb-shm b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/liveupdate-photosgraph.kgdb-shm similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/liveupdate-photosgraph.kgdb-shm rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/liveupdate-photosgraph.kgdb-shm diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/liveupdate-photosgraph.kgdb-wal b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/liveupdate-photosgraph.kgdb-wal similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/liveupdate-photosgraph.kgdb-wal rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/liveupdate-photosgraph.kgdb-wal diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph-tmp.kgdb b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph-tmp.kgdb similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph-tmp.kgdb rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph-tmp.kgdb diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph-tmp.kgdb-shm b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph-tmp.kgdb-shm similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph-tmp.kgdb-shm rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph-tmp.kgdb-shm diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph-tmp.kgdb-wal b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph-tmp.kgdb-wal similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph-tmp.kgdb-wal rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph-tmp.kgdb-wal diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb similarity index 74% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb index 3b57cd22..e56ba6d3 100644 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb and b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-shm b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb-shm similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-shm rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb-shm diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb-wal b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb-wal similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb-wal rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb-wal diff --git a/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist new file mode 100644 index 00000000..7b61916a Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/revgeoprovider.plist b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/revgeoprovider.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/graph/revgeoprovider.plist rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/graph/revgeoprovider.plist diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/vision/1AC5C0AC-46DC-427C-BBD0-EC7187968EA9.cmap b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/vision/1AC5C0AC-46DC-427C-BBD0-EC7187968EA9.cmap similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/vision/1AC5C0AC-46DC-427C-BBD0-EC7187968EA9.cmap rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/vision/1AC5C0AC-46DC-427C-BBD0-EC7187968EA9.cmap diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/vision/AlgoFaceClusterCache.data b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/vision/AlgoFaceClusterCache.data similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/vision/AlgoFaceClusterCache.data rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/vision/AlgoFaceClusterCache.data diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/vision/C5CEB773-7D47-4584-8FC4-81297E7AABB4.cmap b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/vision/C5CEB773-7D47-4584-8FC4-81297E7AABB4.cmap similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/vision/C5CEB773-7D47-4584-8FC4-81297E7AABB4.cmap rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/vision/C5CEB773-7D47-4584-8FC4-81297E7AABB4.cmap diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/vision/PersonPromoter b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/vision/PersonPromoter similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/vision/PersonPromoter rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/vision/PersonPromoter diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/vision/PhotoAnalysisServicePreferences.plist b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/vision/PhotoAnalysisServicePreferences.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/vision/PhotoAnalysisServicePreferences.plist rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/vision/PhotoAnalysisServicePreferences.plist diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/vision/clustererState.plist b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/vision/clustererState.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/vision/clustererState.plist rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/vision/clustererState.plist diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/vision/faceWorkerState.plist b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/vision/faceWorkerState.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/vision/faceWorkerState.plist rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/vision/faceWorkerState.plist diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/vision/vnpersonsmodel.bin b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/vision/vnpersonsmodel.bin similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photoanalysisd/caches/vision/vnpersonsmodel.bin rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photoanalysisd/caches/vision/vnpersonsmodel.bin diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photolibraryd/appPrivateData.plist b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photolibraryd/appPrivateData.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photolibraryd/appPrivateData.plist rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photolibraryd/appPrivateData.plist diff --git a/tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photolibraryd/caches/CreateDatabase_20200726-072928-07:00 b/tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photolibraryd/caches/CreateDatabase_20200726-072928-07:00 similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/private/com.apple.photolibraryd/caches/CreateDatabase_20200726-072928-07:00 rename to tests/Test-Faces-10.15.7.photoslibrary/private/com.apple.photolibraryd/caches/CreateDatabase_20200726-072928-07:00 diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/1/11639AAB-F5C3-46F8-9058-9C19AD726D00_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/1/11639AAB-F5C3-46F8-9058-9C19AD726D00_1_105_c.jpeg new file mode 100644 index 00000000..29c708b8 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/1/11639AAB-F5C3-46F8-9058-9C19AD726D00_1_105_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/2/21EF6CF1-7BA6-43CB-A6B8-597CA9C52E76_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/2/21EF6CF1-7BA6-43CB-A6B8-597CA9C52E76_1_105_c.jpeg new file mode 100644 index 00000000..77e7f7a5 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/2/21EF6CF1-7BA6-43CB-A6B8-597CA9C52E76_1_105_c.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/2/2C766B95-1D8C-40DA-AD8E-39798BF4576D_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/2/2C766B95-1D8C-40DA-AD8E-39798BF4576D_1_105_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/2/2C766B95-1D8C-40DA-AD8E-39798BF4576D_1_105_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/2/2C766B95-1D8C-40DA-AD8E-39798BF4576D_1_105_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D_1_105_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D_1_105_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D_1_105_c.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/3/3609084A-8A63-429D-A122-41F147F6D1BB_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/3/3609084A-8A63-429D-A122-41F147F6D1BB_1_105_c.jpeg new file mode 100644 index 00000000..0e17b16a Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/3/3609084A-8A63-429D-A122-41F147F6D1BB_1_105_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/3/399592DC-B764-4489-929A-4CD820E374C1_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/3/399592DC-B764-4489-929A-4CD820E374C1_1_105_c.jpeg new file mode 100644 index 00000000..afa367c7 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/3/399592DC-B764-4489-929A-4CD820E374C1_1_105_c.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/4/41581532-858D-4767-ADA8-9D26C52FCB96_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/4/41581532-858D-4767-ADA8-9D26C52FCB96_1_105_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/4/41581532-858D-4767-ADA8-9D26C52FCB96_1_105_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/4/41581532-858D-4767-ADA8-9D26C52FCB96_1_105_c.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/4/4736ED4D-B3DC-46EB-93F0-6481674753B1_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/4/4736ED4D-B3DC-46EB-93F0-6481674753B1_1_105_c.jpeg new file mode 100644 index 00000000..91d13af3 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/4/4736ED4D-B3DC-46EB-93F0-6481674753B1_1_105_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/4/4B97B0B4-B5E4-42D2-821F-8926D8B9BEBA_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/4/4B97B0B4-B5E4-42D2-821F-8926D8B9BEBA_1_105_c.jpeg new file mode 100644 index 00000000..49b3fa0e Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/4/4B97B0B4-B5E4-42D2-821F-8926D8B9BEBA_1_105_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/4/4BE91165-2DA2-438C-A768-C332BB3827B1_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/4/4BE91165-2DA2-438C-A768-C332BB3827B1_1_105_c.jpeg new file mode 100644 index 00000000..a152adf3 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/4/4BE91165-2DA2-438C-A768-C332BB3827B1_1_105_c.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/5/52E95CFC-DD9A-4B60-9FC4-FC8EA716DF38_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/5/52E95CFC-DD9A-4B60-9FC4-FC8EA716DF38_1_105_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/5/52E95CFC-DD9A-4B60-9FC4-FC8EA716DF38_1_105_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/5/52E95CFC-DD9A-4B60-9FC4-FC8EA716DF38_1_105_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/5/554B190D-B064-479F-89CB-EB2485C3675F_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/5/554B190D-B064-479F-89CB-EB2485C3675F_1_105_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/5/554B190D-B064-479F-89CB-EB2485C3675F_1_105_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/5/554B190D-B064-479F-89CB-EB2485C3675F_1_105_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/5/5E461935-2FE5-4762-80D3-FCF70739FFA0_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/5/5E461935-2FE5-4762-80D3-FCF70739FFA0_1_105_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/5/5E461935-2FE5-4762-80D3-FCF70739FFA0_1_105_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/5/5E461935-2FE5-4762-80D3-FCF70739FFA0_1_105_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/6/631629B3-8811-4D94-B3E1-751C06ED1D22_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/6/631629B3-8811-4D94-B3E1-751C06ED1D22_1_105_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/6/631629B3-8811-4D94-B3E1-751C06ED1D22_1_105_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/6/631629B3-8811-4D94-B3E1-751C06ED1D22_1_105_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/6/660AF0C1-169A-46BD-907B-D259527162BE_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/6/660AF0C1-169A-46BD-907B-D259527162BE_1_105_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/6/660AF0C1-169A-46BD-907B-D259527162BE_1_105_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/6/660AF0C1-169A-46BD-907B-D259527162BE_1_105_c.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/6/687A4CF6-380A-4B6F-A105-7DA04CF72CFD_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/6/687A4CF6-380A-4B6F-A105-7DA04CF72CFD_1_105_c.jpeg new file mode 100644 index 00000000..ba2fbf76 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/6/687A4CF6-380A-4B6F-A105-7DA04CF72CFD_1_105_c.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/7/74A8D2AD-4A95-402C-AB41-8948B6268DDE_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/7/74A8D2AD-4A95-402C-AB41-8948B6268DDE_1_105_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/7/74A8D2AD-4A95-402C-AB41-8948B6268DDE_1_105_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/7/74A8D2AD-4A95-402C-AB41-8948B6268DDE_1_105_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/7/74C3C5B5-F9EB-4527-A03F-8064B1496542_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/7/74C3C5B5-F9EB-4527-A03F-8064B1496542_1_105_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/7/74C3C5B5-F9EB-4527-A03F-8064B1496542_1_105_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/7/74C3C5B5-F9EB-4527-A03F-8064B1496542_1_105_c.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/7/75DCDF37-A924-4280-BEC7-A5EC6EFE6016_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/7/75DCDF37-A924-4280-BEC7-A5EC6EFE6016_1_105_c.jpeg new file mode 100644 index 00000000..e45940cf Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/7/75DCDF37-A924-4280-BEC7-A5EC6EFE6016_1_105_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/7/77BD401F-4308-47A5-BA28-3369FAAFEBE2_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/7/77BD401F-4308-47A5-BA28-3369FAAFEBE2_1_105_c.jpeg new file mode 100644 index 00000000..8b131d48 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/7/77BD401F-4308-47A5-BA28-3369FAAFEBE2_1_105_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/7/79096F62-C8E9-4652-85A0-D77C972FDFDF_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/7/79096F62-C8E9-4652-85A0-D77C972FDFDF_1_105_c.jpeg new file mode 100644 index 00000000..ee1f85ff Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/7/79096F62-C8E9-4652-85A0-D77C972FDFDF_1_105_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/8/80080A31-77A1-4984-8E51-E7466D9B9F34_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/8/80080A31-77A1-4984-8E51-E7466D9B9F34_1_105_c.jpeg new file mode 100644 index 00000000..a2f48d6a Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/8/80080A31-77A1-4984-8E51-E7466D9B9F34_1_105_c.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/8/82B6F7FA-C552-4A91-9150-372EF3437FDC_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/8/82B6F7FA-C552-4A91-9150-372EF3437FDC_1_105_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/8/82B6F7FA-C552-4A91-9150-372EF3437FDC_1_105_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/8/82B6F7FA-C552-4A91-9150-372EF3437FDC_1_105_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/8/8C5431B3-5F59-4B5F-855A-021408C519E4_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/8/8C5431B3-5F59-4B5F-855A-021408C519E4_1_105_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/8/8C5431B3-5F59-4B5F-855A-021408C519E4_1_105_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/8/8C5431B3-5F59-4B5F-855A-021408C519E4_1_105_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/9/916732EA-E357-47E7-894C-DB0692F24327_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/9/916732EA-E357-47E7-894C-DB0692F24327_1_105_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/9/916732EA-E357-47E7-894C-DB0692F24327_1_105_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/9/916732EA-E357-47E7-894C-DB0692F24327_1_105_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/9/94D0440B-28BD-4724-89BD-A53662F57CC6_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/9/94D0440B-28BD-4724-89BD-A53662F57CC6_1_105_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/9/94D0440B-28BD-4724-89BD-A53662F57CC6_1_105_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/9/94D0440B-28BD-4724-89BD-A53662F57CC6_1_105_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/9/9E7D89FF-05C0-415E-BA48-1B3AE8A8A910_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/9/9E7D89FF-05C0-415E-BA48-1B3AE8A8A910_1_105_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/9/9E7D89FF-05C0-415E-BA48-1B3AE8A8A910_1_105_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/9/9E7D89FF-05C0-415E-BA48-1B3AE8A8A910_1_105_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/A/A2E762C9-F2A2-4806-9684-D1A78910B71E_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/A/A2E762C9-F2A2-4806-9684-D1A78910B71E_1_105_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/A/A2E762C9-F2A2-4806-9684-D1A78910B71E_1_105_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/A/A2E762C9-F2A2-4806-9684-D1A78910B71E_1_105_c.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/A/A478D042-FA26-4863-8E6F-EE749F4710E5_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/A/A478D042-FA26-4863-8E6F-EE749F4710E5_1_105_c.jpeg new file mode 100644 index 00000000..66263047 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/A/A478D042-FA26-4863-8E6F-EE749F4710E5_1_105_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/B/B0757DA2-0D67-4991-980E-E935C4790827_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/B/B0757DA2-0D67-4991-980E-E935C4790827_1_105_c.jpeg new file mode 100644 index 00000000..4a5cfa0a Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/B/B0757DA2-0D67-4991-980E-E935C4790827_1_105_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/B/B507D754-0C5D-4CDF-BAE4-2257292CA28A_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/B/B507D754-0C5D-4CDF-BAE4-2257292CA28A_1_105_c.jpeg new file mode 100644 index 00000000..342d96c5 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/B/B507D754-0C5D-4CDF-BAE4-2257292CA28A_1_105_c.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/C/C36C837E-338D-40D5-B151-0AE3171DEF52_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/C/C36C837E-338D-40D5-B151-0AE3171DEF52_1_105_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/C/C36C837E-338D-40D5-B151-0AE3171DEF52_1_105_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/C/C36C837E-338D-40D5-B151-0AE3171DEF52_1_105_c.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/C/C3BE45BB-F9E8-46C2-88FF-EB6A8E445A31_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/C/C3BE45BB-F9E8-46C2-88FF-EB6A8E445A31_1_105_c.jpeg new file mode 100644 index 00000000..4b749b15 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/C/C3BE45BB-F9E8-46C2-88FF-EB6A8E445A31_1_105_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/C/C547648F-B778-43B5-B12B-4338B7377D09_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/C/C547648F-B778-43B5-B12B-4338B7377D09_1_105_c.jpeg new file mode 100644 index 00000000..f90c3652 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/C/C547648F-B778-43B5-B12B-4338B7377D09_1_105_c.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/E/E2930419-BEFD-4590-BC44-03E48466459D_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/E/E2930419-BEFD-4590-BC44-03E48466459D_1_105_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/E/E2930419-BEFD-4590-BC44-03E48466459D_1_105_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/E/E2930419-BEFD-4590-BC44-03E48466459D_1_105_c.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/E/E7B8ED9C-314E-4459-895D-6BDC6B7D8F6C_1_105_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/E/E7B8ED9C-314E-4459-895D-6BDC6B7D8F6C_1_105_c.jpeg new file mode 100644 index 00000000..46c5f5f9 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/E/E7B8ED9C-314E-4459-895D-6BDC6B7D8F6C_1_105_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/1/11639AAB-F5C3-46F8-9058-9C19AD726D00_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/1/11639AAB-F5C3-46F8-9058-9C19AD726D00_4_5005_c.jpeg new file mode 100644 index 00000000..1489ebd5 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/1/11639AAB-F5C3-46F8-9058-9C19AD726D00_4_5005_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/2/21EF6CF1-7BA6-43CB-A6B8-597CA9C52E76_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/2/21EF6CF1-7BA6-43CB-A6B8-597CA9C52E76_4_5005_c.jpeg new file mode 100644 index 00000000..d5b4cb50 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/2/21EF6CF1-7BA6-43CB-A6B8-597CA9C52E76_4_5005_c.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/2/26011634-7F89-47DD-AA3B-A3693708E3F9_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/2/26011634-7F89-47DD-AA3B-A3693708E3F9_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/2/26011634-7F89-47DD-AA3B-A3693708E3F9_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/2/26011634-7F89-47DD-AA3B-A3693708E3F9_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/2/2C766B95-1D8C-40DA-AD8E-39798BF4576D_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/2/2C766B95-1D8C-40DA-AD8E-39798BF4576D_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/2/2C766B95-1D8C-40DA-AD8E-39798BF4576D_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/2/2C766B95-1D8C-40DA-AD8E-39798BF4576D_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/3/3609084A-8A63-429D-A122-41F147F6D1BB_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/3/3609084A-8A63-429D-A122-41F147F6D1BB_4_5005_c.jpeg new file mode 100644 index 00000000..b12d4937 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/3/3609084A-8A63-429D-A122-41F147F6D1BB_4_5005_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/3/399592DC-B764-4489-929A-4CD820E374C1_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/3/399592DC-B764-4489-929A-4CD820E374C1_4_5005_c.jpeg new file mode 100644 index 00000000..ee1365fc Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/3/399592DC-B764-4489-929A-4CD820E374C1_4_5005_c.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/4/41581532-858D-4767-ADA8-9D26C52FCB96_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/4/41581532-858D-4767-ADA8-9D26C52FCB96_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/4/41581532-858D-4767-ADA8-9D26C52FCB96_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/4/41581532-858D-4767-ADA8-9D26C52FCB96_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/4/4736ED4D-B3DC-46EB-93F0-6481674753B1_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/4/4736ED4D-B3DC-46EB-93F0-6481674753B1_4_5005_c.jpeg new file mode 100644 index 00000000..c5d79cc8 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/4/4736ED4D-B3DC-46EB-93F0-6481674753B1_4_5005_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/4/4B97B0B4-B5E4-42D2-821F-8926D8B9BEBA_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/4/4B97B0B4-B5E4-42D2-821F-8926D8B9BEBA_4_5005_c.jpeg new file mode 100644 index 00000000..57c0671a Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/4/4B97B0B4-B5E4-42D2-821F-8926D8B9BEBA_4_5005_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/4/4BE91165-2DA2-438C-A768-C332BB3827B1_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/4/4BE91165-2DA2-438C-A768-C332BB3827B1_4_5005_c.jpeg new file mode 100644 index 00000000..504b2d79 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/4/4BE91165-2DA2-438C-A768-C332BB3827B1_4_5005_c.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/5/52E95CFC-DD9A-4B60-9FC4-FC8EA716DF38_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/5/52E95CFC-DD9A-4B60-9FC4-FC8EA716DF38_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/5/52E95CFC-DD9A-4B60-9FC4-FC8EA716DF38_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/5/52E95CFC-DD9A-4B60-9FC4-FC8EA716DF38_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/5/554B190D-B064-479F-89CB-EB2485C3675F_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/5/554B190D-B064-479F-89CB-EB2485C3675F_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/5/554B190D-B064-479F-89CB-EB2485C3675F_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/5/554B190D-B064-479F-89CB-EB2485C3675F_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/5/5E461935-2FE5-4762-80D3-FCF70739FFA0_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/5/5E461935-2FE5-4762-80D3-FCF70739FFA0_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/5/5E461935-2FE5-4762-80D3-FCF70739FFA0_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/5/5E461935-2FE5-4762-80D3-FCF70739FFA0_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/6/631629B3-8811-4D94-B3E1-751C06ED1D22_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/6/631629B3-8811-4D94-B3E1-751C06ED1D22_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/6/631629B3-8811-4D94-B3E1-751C06ED1D22_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/6/631629B3-8811-4D94-B3E1-751C06ED1D22_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/6/660AF0C1-169A-46BD-907B-D259527162BE_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/6/660AF0C1-169A-46BD-907B-D259527162BE_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/6/660AF0C1-169A-46BD-907B-D259527162BE_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/6/660AF0C1-169A-46BD-907B-D259527162BE_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/6/687A4CF6-380A-4B6F-A105-7DA04CF72CFD_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/6/687A4CF6-380A-4B6F-A105-7DA04CF72CFD_4_5005_c.jpeg new file mode 100644 index 00000000..e295a58f Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/6/687A4CF6-380A-4B6F-A105-7DA04CF72CFD_4_5005_c.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/7/74A8D2AD-4A95-402C-AB41-8948B6268DDE_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/7/74A8D2AD-4A95-402C-AB41-8948B6268DDE_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/7/74A8D2AD-4A95-402C-AB41-8948B6268DDE_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/7/74A8D2AD-4A95-402C-AB41-8948B6268DDE_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/7/74C3C5B5-F9EB-4527-A03F-8064B1496542_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/7/74C3C5B5-F9EB-4527-A03F-8064B1496542_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/7/74C3C5B5-F9EB-4527-A03F-8064B1496542_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/7/74C3C5B5-F9EB-4527-A03F-8064B1496542_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/7/75DCDF37-A924-4280-BEC7-A5EC6EFE6016_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/7/75DCDF37-A924-4280-BEC7-A5EC6EFE6016_4_5005_c.jpeg new file mode 100644 index 00000000..20563144 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/7/75DCDF37-A924-4280-BEC7-A5EC6EFE6016_4_5005_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/7/77BD401F-4308-47A5-BA28-3369FAAFEBE2_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/7/77BD401F-4308-47A5-BA28-3369FAAFEBE2_4_5005_c.jpeg new file mode 100644 index 00000000..40bab89e Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/7/77BD401F-4308-47A5-BA28-3369FAAFEBE2_4_5005_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/7/79096F62-C8E9-4652-85A0-D77C972FDFDF_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/7/79096F62-C8E9-4652-85A0-D77C972FDFDF_4_5005_c.jpeg new file mode 100644 index 00000000..269e61fb Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/7/79096F62-C8E9-4652-85A0-D77C972FDFDF_4_5005_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/8/80080A31-77A1-4984-8E51-E7466D9B9F34_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/8/80080A31-77A1-4984-8E51-E7466D9B9F34_4_5005_c.jpeg new file mode 100644 index 00000000..cb637f58 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/8/80080A31-77A1-4984-8E51-E7466D9B9F34_4_5005_c.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/8/82B6F7FA-C552-4A91-9150-372EF3437FDC_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/8/82B6F7FA-C552-4A91-9150-372EF3437FDC_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/8/82B6F7FA-C552-4A91-9150-372EF3437FDC_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/8/82B6F7FA-C552-4A91-9150-372EF3437FDC_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/8/8C5431B3-5F59-4B5F-855A-021408C519E4_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/8/8C5431B3-5F59-4B5F-855A-021408C519E4_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/8/8C5431B3-5F59-4B5F-855A-021408C519E4_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/8/8C5431B3-5F59-4B5F-855A-021408C519E4_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/9/916732EA-E357-47E7-894C-DB0692F24327_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/9/916732EA-E357-47E7-894C-DB0692F24327_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/9/916732EA-E357-47E7-894C-DB0692F24327_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/9/916732EA-E357-47E7-894C-DB0692F24327_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/9/94D0440B-28BD-4724-89BD-A53662F57CC6_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/9/94D0440B-28BD-4724-89BD-A53662F57CC6_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/9/94D0440B-28BD-4724-89BD-A53662F57CC6_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/9/94D0440B-28BD-4724-89BD-A53662F57CC6_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/9/9E7D89FF-05C0-415E-BA48-1B3AE8A8A910_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/9/9E7D89FF-05C0-415E-BA48-1B3AE8A8A910_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/9/9E7D89FF-05C0-415E-BA48-1B3AE8A8A910_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/9/9E7D89FF-05C0-415E-BA48-1B3AE8A8A910_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/A/A2E762C9-F2A2-4806-9684-D1A78910B71E_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/A/A2E762C9-F2A2-4806-9684-D1A78910B71E_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/A/A2E762C9-F2A2-4806-9684-D1A78910B71E_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/A/A2E762C9-F2A2-4806-9684-D1A78910B71E_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/A/A478D042-FA26-4863-8E6F-EE749F4710E5_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/A/A478D042-FA26-4863-8E6F-EE749F4710E5_4_5005_c.jpeg new file mode 100644 index 00000000..b8b4bfe9 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/A/A478D042-FA26-4863-8E6F-EE749F4710E5_4_5005_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/B/B0757DA2-0D67-4991-980E-E935C4790827_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/B/B0757DA2-0D67-4991-980E-E935C4790827_4_5005_c.jpeg new file mode 100644 index 00000000..a253c4a6 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/B/B0757DA2-0D67-4991-980E-E935C4790827_4_5005_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/B/B507D754-0C5D-4CDF-BAE4-2257292CA28A_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/B/B507D754-0C5D-4CDF-BAE4-2257292CA28A_4_5005_c.jpeg new file mode 100644 index 00000000..540244f3 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/B/B507D754-0C5D-4CDF-BAE4-2257292CA28A_4_5005_c.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/C/C36C837E-338D-40D5-B151-0AE3171DEF52_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/C/C36C837E-338D-40D5-B151-0AE3171DEF52_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/C/C36C837E-338D-40D5-B151-0AE3171DEF52_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/C/C36C837E-338D-40D5-B151-0AE3171DEF52_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/C/C3BE45BB-F9E8-46C2-88FF-EB6A8E445A31_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/C/C3BE45BB-F9E8-46C2-88FF-EB6A8E445A31_4_5005_c.jpeg new file mode 100644 index 00000000..244ea1aa Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/C/C3BE45BB-F9E8-46C2-88FF-EB6A8E445A31_4_5005_c.jpeg differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/C/C547648F-B778-43B5-B12B-4338B7377D09_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/C/C547648F-B778-43B5-B12B-4338B7377D09_4_5005_c.jpeg new file mode 100644 index 00000000..2f500f21 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/C/C547648F-B778-43B5-B12B-4338B7377D09_4_5005_c.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/D/D615DA33-90CD-4F69-A216-496F3D983539_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/D/D615DA33-90CD-4F69-A216-496F3D983539_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/D/D615DA33-90CD-4F69-A216-496F3D983539_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/D/D615DA33-90CD-4F69-A216-496F3D983539_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/E/E2930419-BEFD-4590-BC44-03E48466459D_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/E/E2930419-BEFD-4590-BC44-03E48466459D_4_5005_c.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/masters/E/E2930419-BEFD-4590-BC44-03E48466459D_4_5005_c.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/E/E2930419-BEFD-4590-BC44-03E48466459D_4_5005_c.jpeg diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/E/E7B8ED9C-314E-4459-895D-6BDC6B7D8F6C_4_5005_c.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/E/E7B8ED9C-314E-4459-895D-6BDC6B7D8F6C_4_5005_c.jpeg new file mode 100644 index 00000000..c6a1fe49 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/masters/E/E7B8ED9C-314E-4459-895D-6BDC6B7D8F6C_4_5005_c.jpeg differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/thumbs/3305.ithmb b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/thumbs/3305.ithmb similarity index 71% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/thumbs/3305.ithmb rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/thumbs/3305.ithmb index c19695e1..bcfd1ad5 100644 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/thumbs/3305.ithmb and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/thumbs/3305.ithmb differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/thumbs/4031.ithmb b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/thumbs/4031.ithmb similarity index 79% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/thumbs/4031.ithmb rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/thumbs/4031.ithmb index 313f9c67..049c6b44 100644 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/thumbs/4031.ithmb and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/thumbs/4031.ithmb differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/thumbs/4132.ithmb b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/thumbs/4132.ithmb similarity index 77% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/thumbs/4132.ithmb rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/thumbs/4132.ithmb index 03b5206d..96891605 100644 Binary files a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/thumbs/4132.ithmb and b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/thumbs/4132.ithmb differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/thumbs/thumbnailConfiguration b/tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/thumbs/thumbnailConfiguration similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/derivatives/thumbs/thumbnailConfiguration rename to tests/Test-Faces-10.15.7.photoslibrary/resources/derivatives/thumbs/thumbnailConfiguration diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Album-snapshot.plj b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Album-snapshot.plj similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Album-snapshot.plj rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Album-snapshot.plj diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Album.plist b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Album.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Album.plist rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Album.plist diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Asset-change.plj b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Asset-change.plj new file mode 100644 index 00000000..c4bb6285 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Asset-change.plj differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Asset-snapshot.plj b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Asset-snapshot.plj similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Asset-snapshot.plj rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Asset-snapshot.plj diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Asset.plist b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Asset.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Asset.plist rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Asset.plist diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/DeferredRebuildFace-snapshot.plj b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/DeferredRebuildFace-snapshot.plj similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/DeferredRebuildFace-snapshot.plj rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/DeferredRebuildFace-snapshot.plj diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/DeferredRebuildFace.plist b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/DeferredRebuildFace.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/DeferredRebuildFace.plist rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/DeferredRebuildFace.plist diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/DetectedFace-change.plj b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/DetectedFace-change.plj new file mode 100644 index 00000000..4a8fa70f Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/DetectedFace-change.plj differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/DetectedFace-snapshot.plj b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/DetectedFace-snapshot.plj similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/DetectedFace-snapshot.plj rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/DetectedFace-snapshot.plj diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/DetectedFace.plist b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/DetectedFace.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/DetectedFace.plist rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/DetectedFace.plist diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/FetchingAlbum-snapshot.plj b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/FetchingAlbum-snapshot.plj similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/FetchingAlbum-snapshot.plj rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/FetchingAlbum-snapshot.plj diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/FetchingAlbum.plist b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/FetchingAlbum.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/FetchingAlbum.plist rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/FetchingAlbum.plist diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/FileSystemVolume-snapshot.plj b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/FileSystemVolume-snapshot.plj similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/FileSystemVolume-snapshot.plj rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/FileSystemVolume-snapshot.plj diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/FileSystemVolume.plist b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/FileSystemVolume.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/FileSystemVolume.plist rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/FileSystemVolume.plist diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Folder-snapshot.plj b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Folder-snapshot.plj similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Folder-snapshot.plj rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Folder-snapshot.plj diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Folder.plist b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Folder.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Folder.plist rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Folder.plist diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/HistoryToken.plist b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/HistoryToken.plist new file mode 100644 index 00000000..34ee5235 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/HistoryToken.plist differ diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/ImportSession-change.plj b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/ImportSession-change.plj new file mode 100644 index 00000000..5294cfa9 Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/ImportSession-change.plj differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/ImportSession-snapshot.plj b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/ImportSession-snapshot.plj similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/ImportSession-snapshot.plj rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/ImportSession-snapshot.plj diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/ImportSession.plist b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/ImportSession.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/ImportSession.plist rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/ImportSession.plist diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Keyword-snapshot.plj b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Keyword-snapshot.plj similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Keyword-snapshot.plj rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Keyword-snapshot.plj diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Keyword.plist b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Keyword.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Keyword.plist rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Keyword.plist diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Memory-snapshot.plj b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Memory-snapshot.plj similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Memory-snapshot.plj rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Memory-snapshot.plj diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Memory.plist b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Memory.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Memory.plist rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Memory.plist diff --git a/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Person-change.plj b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Person-change.plj new file mode 100644 index 00000000..597a8b3f Binary files /dev/null and b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Person-change.plj differ diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Person-snapshot.plj b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Person-snapshot.plj similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Person-snapshot.plj rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Person-snapshot.plj diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Person.plist b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Person.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/Person.plist rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/Person.plist diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/ProjectAlbum-snapshot.plj b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/ProjectAlbum-snapshot.plj similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/ProjectAlbum-snapshot.plj rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/ProjectAlbum-snapshot.plj diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/journals/ProjectAlbum.plist b/tests/Test-Faces-10.15.7.photoslibrary/resources/journals/ProjectAlbum.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/journals/ProjectAlbum.plist rename to tests/Test-Faces-10.15.7.photoslibrary/resources/journals/ProjectAlbum.plist diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/renders/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D.plist b/tests/Test-Faces-10.15.7.photoslibrary/resources/renders/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D.plist similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/renders/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D.plist rename to tests/Test-Faces-10.15.7.photoslibrary/resources/renders/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D.plist diff --git a/tests/Test-Faces-10.15.6.photoslibrary/resources/renders/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D_1_201_a.jpeg b/tests/Test-Faces-10.15.7.photoslibrary/resources/renders/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D_1_201_a.jpeg similarity index 100% rename from tests/Test-Faces-10.15.6.photoslibrary/resources/renders/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D_1_201_a.jpeg rename to tests/Test-Faces-10.15.7.photoslibrary/resources/renders/2/2F7AF9F2-2930-4A8E-BCC7-D6DB52DAAB0D_1_201_a.jpeg diff --git a/tests/search_info_test_data_10_15_7.json b/tests/search_info_test_data_10_15_7.json index f8442c2f..ad98dffd 100644 --- a/tests/search_info_test_data_10_15_7.json +++ b/tests/search_info_test_data_10_15_7.json @@ -1 +1 @@ -{"UUID_SEARCH_INFO": {"C8EAF50A-D891-4E0C-8086-C417E1284153": {"labels": ["Butter", "Food"], "place_names": ["Durham Bulls Athletic Park"], "streets": ["Blackwell St"], "neighborhoods": ["American Tobacco District", "Downtown Durham"], "city": "Durham", "locality_names": ["Durham"], "state": "North Carolina", "state_abbreviation": "NC", "country": "United States", "bodies_of_water": [], "month": "October", "year": "2018", "holidays": [], "activities": ["Entertainment", "Travel", "Dining", "Dinner", "Trip"], "season": "Fall", "venues": ["Copa", "Luna Rotisserie and Empanadas", "Pie Pusher's", "The Pinhook"], "venue_types": [], "media_types": []}, "71DFB4C3-E868-4BE4-906E-D96BD8692D7E": {"labels": ["Sunset Sunrise", "Sky", "Outdoor", "Land", "Desert"], "place_names": ["Royal Palms State Beach"], "streets": [], "neighborhoods": ["San Pedro"], "city": "Los Angeles", "locality_names": [], "state": "California", "state_abbreviation": "", "country": "United States", "bodies_of_water": ["Catalina Channel"], "month": "November", "year": "2017", "holidays": [], "activities": ["Beach Activity", "Activity"], "season": "Fall", "venues": [], "venue_types": [], "media_types": ["Live Photos"]}, "2C151013-5BBA-4D00-B70F-1C9420418B86": {"labels": ["Land", "Water Body", "Bench", "Furniture", "Water", "Plant", "Outdoor", "Vegetation", "Forest", "People"], "place_names": [], "streets": [], "neighborhoods": [], "city": "", "locality_names": [], "state": "", "state_abbreviation": "", "country": "", "bodies_of_water": [], "month": "December", "year": "2014", "holidays": ["Christmas Day"], "activities": ["Celebration", "Holiday"], "season": "Winter", "venues": [], "venue_types": [], "media_types": []}}, "UUID_SEARCH_INFO_NORMALIZED": {"C8EAF50A-D891-4E0C-8086-C417E1284153": {"labels": ["butter", "food"], "place_names": ["durham bulls athletic park"], "streets": ["blackwell st"], "neighborhoods": ["american tobacco district", "downtown durham"], "city": "durham", "locality_names": ["durham"], "state": "north carolina", "state_abbreviation": "nc", "country": "united states", "bodies_of_water": [], "month": "october", "year": "2018", "holidays": [], "activities": ["entertainment", "travel", "dining", "dinner", "trip"], "season": "fall", "venues": ["copa", "luna rotisserie and empanadas", "pie pusher's", "the pinhook"], "venue_types": [], "media_types": []}, "71DFB4C3-E868-4BE4-906E-D96BD8692D7E": {"labels": ["sunset sunrise", "sky", "outdoor", "land", "desert"], "place_names": ["royal palms state beach"], "streets": [], "neighborhoods": ["san pedro"], "city": "los angeles", "locality_names": [], "state": "california", "state_abbreviation": "", "country": "united states", "bodies_of_water": ["catalina channel"], "month": "november", "year": "2017", "holidays": [], "activities": ["beach activity", "activity"], "season": "fall", "venues": [], "venue_types": [], "media_types": ["live photos"]}, "2C151013-5BBA-4D00-B70F-1C9420418B86": {"labels": ["land", "water body", "bench", "furniture", "water", "plant", "outdoor", "vegetation", "forest", "people"], "place_names": [], "streets": [], "neighborhoods": [], "city": "", "locality_names": [], "state": "", "state_abbreviation": "", "country": "", "bodies_of_water": [], "month": "december", "year": "2014", "holidays": ["christmas day"], "activities": ["celebration", "holiday"], "season": "winter", "venues": [], "venue_types": [], "media_types": []}}, "UUID_SEARCH_INFO_ALL": {"C8EAF50A-D891-4E0C-8086-C417E1284153": ["Butter", "Food", "Durham Bulls Athletic Park", "Blackwell St", "American Tobacco District", "Downtown Durham", "Durham", "Entertainment", "Travel", "Dining", "Dinner", "Trip", "Copa", "Luna Rotisserie and Empanadas", "Pie Pusher's", "The Pinhook", "Durham", "North Carolina", "NC", "United States", "October", "2018", "Fall"], "71DFB4C3-E868-4BE4-906E-D96BD8692D7E": ["Sunset Sunrise", "Sky", "Outdoor", "Land", "Desert", "Royal Palms State Beach", "San Pedro", "Catalina Channel", "Beach Activity", "Activity", "Live Photos", "Los Angeles", "California", "United States", "November", "2017", "Fall"], "2C151013-5BBA-4D00-B70F-1C9420418B86": ["Land", "Water Body", "Bench", "Furniture", "Water", "Plant", "Outdoor", "Vegetation", "Forest", "People", "Christmas Day", "Celebration", "Holiday", "December", "2014", "Winter"]}, "UUID_SEARCH_INFO_ALL_NORMALIZED": {"C8EAF50A-D891-4E0C-8086-C417E1284153": ["butter", "food", "durham bulls athletic park", "blackwell st", "american tobacco district", "downtown durham", "durham", "entertainment", "travel", "dining", "dinner", "trip", "copa", "luna rotisserie and empanadas", "pie pusher's", "the pinhook", "durham", "north carolina", "nc", "united states", "october", "2018", "fall"], "71DFB4C3-E868-4BE4-906E-D96BD8692D7E": ["sunset sunrise", "sky", "outdoor", "land", "desert", "royal palms state beach", "san pedro", "catalina channel", "beach activity", "activity", "live photos", "los angeles", "california", "united states", "november", "2017", "fall"], "2C151013-5BBA-4D00-B70F-1C9420418B86": ["land", "water body", "bench", "furniture", "water", "plant", "outdoor", "vegetation", "forest", "people", "christmas day", "celebration", "holiday", "december", "2014", "winter"]}} +{"UUID_SEARCH_INFO": {"C8EAF50A-D891-4E0C-8086-C417E1284153": {"labels": ["Food", "Butter"], "place_names": ["Durham Bulls Athletic Park"], "streets": ["Blackwell St"], "neighborhoods": ["American Tobacco District", "Downtown Durham"], "city": "Durham", "locality_names": ["Durham"], "state": "North Carolina", "state_abbreviation": "NC", "country": "United States", "bodies_of_water": [], "month": "October", "year": "2018", "holidays": [], "activities": ["Dinner", "Travel", "Entertainment", "Dining", "Trip"], "season": "Fall", "venues": ["Copa", "Luna Rotisserie and Empanadas", "Pie Pusher's", "The Pinhook"], "venue_types": [], "media_types": []}, "71DFB4C3-E868-4BE4-906E-D96BD8692D7E": {"labels": ["Land", "Desert", "Outdoor", "Sky", "Sunset Sunrise"], "place_names": ["Royal Palms State Beach"], "streets": [], "neighborhoods": ["San Pedro"], "city": "Los Angeles", "locality_names": [], "state": "California", "state_abbreviation": "", "country": "United States", "bodies_of_water": ["Catalina Channel"], "month": "November", "year": "2017", "holidays": [], "activities": ["Beach Activity", "Activity"], "season": "Fall", "venues": [], "venue_types": [], "media_types": ["Live Photos"]}, "2C151013-5BBA-4D00-B70F-1C9420418B86": {"labels": ["Water Body", "Land", "Forest", "Water", "Plant", "Outdoor", "Vegetation", "Furniture", "Bench", "People"], "place_names": [], "streets": [], "neighborhoods": [], "city": "", "locality_names": [], "state": "", "state_abbreviation": "", "country": "", "bodies_of_water": [], "month": "December", "year": "2014", "holidays": ["Christmas Day"], "activities": ["Celebration", "Holiday"], "season": "Winter", "venues": [], "venue_types": [], "media_types": []}}, "UUID_SEARCH_INFO_NORMALIZED": {"C8EAF50A-D891-4E0C-8086-C417E1284153": {"labels": ["food", "butter"], "place_names": ["durham bulls athletic park"], "streets": ["blackwell st"], "neighborhoods": ["american tobacco district", "downtown durham"], "city": "durham", "locality_names": ["durham"], "state": "north carolina", "state_abbreviation": "nc", "country": "united states", "bodies_of_water": [], "month": "october", "year": "2018", "holidays": [], "activities": ["dinner", "travel", "entertainment", "dining", "trip"], "season": "fall", "venues": ["copa", "luna rotisserie and empanadas", "pie pusher's", "the pinhook"], "venue_types": [], "media_types": []}, "71DFB4C3-E868-4BE4-906E-D96BD8692D7E": {"labels": ["land", "desert", "outdoor", "sky", "sunset sunrise"], "place_names": ["royal palms state beach"], "streets": [], "neighborhoods": ["san pedro"], "city": "los angeles", "locality_names": [], "state": "california", "state_abbreviation": "", "country": "united states", "bodies_of_water": ["catalina channel"], "month": "november", "year": "2017", "holidays": [], "activities": ["beach activity", "activity"], "season": "fall", "venues": [], "venue_types": [], "media_types": ["live photos"]}, "2C151013-5BBA-4D00-B70F-1C9420418B86": {"labels": ["water body", "land", "forest", "water", "plant", "outdoor", "vegetation", "furniture", "bench", "people"], "place_names": [], "streets": [], "neighborhoods": [], "city": "", "locality_names": [], "state": "", "state_abbreviation": "", "country": "", "bodies_of_water": [], "month": "december", "year": "2014", "holidays": ["christmas day"], "activities": ["celebration", "holiday"], "season": "winter", "venues": [], "venue_types": [], "media_types": []}}, "UUID_SEARCH_INFO_ALL": {"C8EAF50A-D891-4E0C-8086-C417E1284153": ["Food", "Butter", "Durham Bulls Athletic Park", "Blackwell St", "American Tobacco District", "Downtown Durham", "Durham", "Dinner", "Travel", "Entertainment", "Dining", "Trip", "Copa", "Luna Rotisserie and Empanadas", "Pie Pusher's", "The Pinhook", "Durham", "North Carolina", "NC", "United States", "October", "2018", "Fall"], "71DFB4C3-E868-4BE4-906E-D96BD8692D7E": ["Land", "Desert", "Outdoor", "Sky", "Sunset Sunrise", "Royal Palms State Beach", "San Pedro", "Catalina Channel", "Beach Activity", "Activity", "Live Photos", "Los Angeles", "California", "United States", "November", "2017", "Fall"], "2C151013-5BBA-4D00-B70F-1C9420418B86": ["Water Body", "Land", "Forest", "Water", "Plant", "Outdoor", "Vegetation", "Furniture", "Bench", "People", "Christmas Day", "Celebration", "Holiday", "December", "2014", "Winter"]}, "UUID_SEARCH_INFO_ALL_NORMALIZED": {"C8EAF50A-D891-4E0C-8086-C417E1284153": ["food", "butter", "durham bulls athletic park", "blackwell st", "american tobacco district", "downtown durham", "durham", "dinner", "travel", "entertainment", "dining", "trip", "copa", "luna rotisserie and empanadas", "pie pusher's", "the pinhook", "durham", "north carolina", "nc", "united states", "october", "2018", "fall"], "71DFB4C3-E868-4BE4-906E-D96BD8692D7E": ["land", "desert", "outdoor", "sky", "sunset sunrise", "royal palms state beach", "san pedro", "catalina channel", "beach activity", "activity", "live photos", "los angeles", "california", "united states", "november", "2017", "fall"], "2C151013-5BBA-4D00-B70F-1C9420418B86": ["water body", "land", "forest", "water", "plant", "outdoor", "vegetation", "furniture", "bench", "people", "christmas day", "celebration", "holiday", "december", "2014", "winter"]}} diff --git a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.xmp b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.xmp index 7804a0da..0e3a899c 100644 --- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.xmp +++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girl holding pumpkin + Girl holding pumpkin @@ -17,34 +17,80 @@ - Kids + Kids 2018-09-28T16:07:07-04:00 - - + + - - Katie - + + Katie + - - + + - - Kids - + + Kids + - - + + 2018-09-28T16:07:07 2018-09-28T16:07:07 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.162395 + 0.243652 + 0.583266 + 0.277309 + normalized + + Katie + 0.1693693995475769 + Face + + + + + + + + + + + Katie + 0.461441, 0.196112, 0.243652, 0.162395 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.xmp b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.xmp index 05a7efbb..e56fc61c 100644 --- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.xmp +++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girl holding pumpkin + Girl holding pumpkin @@ -17,40 +17,86 @@ - AlbumInFolder - Kids - Pumpkin Farm - Test Album (1) + AlbumInFolder + Kids + Pumpkin Farm + Test Album (1) 2018-09-28T16:07:07-04:00 - - + + - - Katie - + + Katie + - - + + - - AlbumInFolder - Kids - Pumpkin Farm - Test Album (1) - + + AlbumInFolder + Kids + Pumpkin Farm + Test Album (1) + - - + + 2018-09-28T16:07:07 2018-09-28T16:07:07 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.162395 + 0.243652 + 0.583266 + 0.277309 + normalized + + Katie + 0.1693693995475769 + Face + + + + + + + + + + + Katie + 0.461441, 0.196112, 0.243652, 0.162395 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ext.xmp b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ext.xmp index 7804a0da..0e3a899c 100644 --- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ext.xmp +++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ext.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girl holding pumpkin + Girl holding pumpkin @@ -17,34 +17,80 @@ - Kids + Kids 2018-09-28T16:07:07-04:00 - - + + - - Katie - + + Katie + - - + + - - Kids - + + Kids + - - + + 2018-09-28T16:07:07 2018-09-28T16:07:07 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.162395 + 0.243652 + 0.583266 + 0.277309 + normalized + + Katie + 0.1693693995475769 + Face + + + + + + + + + + + Katie + 0.461441, 0.196112, 0.243652, 0.162395 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.xmp b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.xmp index 111ea08b..d52a2622 100644 --- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.xmp +++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_keyword_template.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girl holding pumpkin + Girl holding pumpkin @@ -17,42 +17,88 @@ - 2018 - Folder1/SubFolder2/AlbumInFolder - Kids - Pumpkin Farm - Test Album (1) + 2018 + Folder1/SubFolder2/AlbumInFolder + Kids + Pumpkin Farm + Test Album (1) 2018-09-28T16:07:07-04:00 - - + + - - Katie - + + Katie + - - + + - - 2018 - Folder1/SubFolder2/AlbumInFolder - Kids - Pumpkin Farm - Test Album (1) - + + 2018 + Folder1/SubFolder2/AlbumInFolder + Kids + Pumpkin Farm + Test Album (1) + - - + + 2018-09-28T16:07:07 2018-09-28T16:07:07 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.162395 + 0.243652 + 0.583266 + 0.277309 + normalized + + Katie + 0.1693693995475769 + Face + + + + + + + + + + + Katie + 0.461441, 0.196112, 0.243652, 0.162395 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.xmp b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.xmp index 2c19d1f4..fa1512c8 100644 --- a/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.xmp +++ b/tests/sidecars/15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girl holding pumpkin + Girl holding pumpkin @@ -17,36 +17,82 @@ - Katie - Kids + Katie + Kids 2018-09-28T16:07:07-04:00 - - + + - - Katie - + + Katie + - - + + - - Katie - Kids - + + Katie + Kids + - - + + 2018-09-28T16:07:07 2018-09-28T16:07:07 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.162395 + 0.243652 + 0.583266 + 0.277309 + normalized + + Katie + 0.1693693995475769 + Face + + + + + + + + + + + Katie + 0.461441, 0.196112, 0.243652, 0.162395 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA.xmp b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA.xmp index 87fd86ea..cec3ae68 100644 --- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA.xmp +++ b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - + @@ -17,41 +17,56 @@ - England - London - London 2018 - St. James's Park - UK - United Kingdom + England + London + London 2018 + St. James's Park + UK + United Kingdom 2018-10-13T09:18:12.501000-04:00 - - - - + + + + - - England - London - London 2018 - St. James's Park - UK - United Kingdom - + + England + London + London 2018 + St. James's Park + UK + United Kingdom + - - + + 2018-10-13T09:18:12 2018-10-13T09:18:12 - - + + 0,7.908329999999999W 51,30.21430019999997N - - - \ No newline at end of file + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_albums_as_keywords.xmp b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_albums_as_keywords.xmp index 87fd86ea..cec3ae68 100644 --- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_albums_as_keywords.xmp +++ b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_albums_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - + @@ -17,41 +17,56 @@ - England - London - London 2018 - St. James's Park - UK - United Kingdom + England + London + London 2018 + St. James's Park + UK + United Kingdom 2018-10-13T09:18:12.501000-04:00 - - - - + + + + - - England - London - London 2018 - St. James's Park - UK - United Kingdom - + + England + London + London 2018 + St. James's Park + UK + United Kingdom + - - + + 2018-10-13T09:18:12 2018-10-13T09:18:12 - - + + 0,7.908329999999999W 51,30.21430019999997N - - - \ No newline at end of file + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_ext.xmp b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_ext.xmp index 87fd86ea..cec3ae68 100644 --- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_ext.xmp +++ b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_ext.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - + @@ -17,41 +17,56 @@ - England - London - London 2018 - St. James's Park - UK - United Kingdom + England + London + London 2018 + St. James's Park + UK + United Kingdom 2018-10-13T09:18:12.501000-04:00 - - - - + + + + - - England - London - London 2018 - St. James's Park - UK - United Kingdom - + + England + London + London 2018 + St. James's Park + UK + United Kingdom + - - + + 2018-10-13T09:18:12 2018-10-13T09:18:12 - - + + 0,7.908329999999999W 51,30.21430019999997N - - - \ No newline at end of file + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_keyword_template.xmp b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_keyword_template.xmp index 357429f9..4abb9a9c 100644 --- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_keyword_template.xmp +++ b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_keyword_template.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - + @@ -17,43 +17,58 @@ - 2018 - England - London - London 2018 - St. James's Park - UK - United Kingdom + 2018 + England + London + London 2018 + St. James's Park + UK + United Kingdom 2018-10-13T09:18:12.501000-04:00 - - - - + + + + - - 2018 - England - London - London 2018 - St. James's Park - UK - United Kingdom - + + 2018 + England + London + London 2018 + St. James's Park + UK + United Kingdom + - - + + 2018-10-13T09:18:12 2018-10-13T09:18:12 - - + + 0,7.908329999999999W 51,30.21430019999997N - - - \ No newline at end of file + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_persons_as_keywords.xmp b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_persons_as_keywords.xmp index 87fd86ea..cec3ae68 100644 --- a/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_persons_as_keywords.xmp +++ b/tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_persons_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - + @@ -17,41 +17,56 @@ - England - London - London 2018 - St. James's Park - UK - United Kingdom + England + London + London 2018 + St. James's Park + UK + United Kingdom 2018-10-13T09:18:12.501000-04:00 - - - - + + + + - - England - London - London 2018 - St. James's Park - UK - United Kingdom - + + England + London + London 2018 + St. James's Park + UK + United Kingdom + - - + + 2018-10-13T09:18:12 2018-10-13T09:18:12 - - + + 0,7.908329999999999W 51,30.21430019999997N - - - \ No newline at end of file + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4.xmp b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4.xmp index f8a26dac..6a8c4399 100644 --- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4.xmp +++ b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Wedding tulips + Wedding tulips @@ -17,31 +17,46 @@ - flowers - wedding + flowers + wedding 2019-07-04T16:24:01-04:00 - - - - + + + + - - flowers - wedding - + + flowers + wedding + - - + + 2019-07-04T16:24:01 2019-07-04T16:24:01 - - - - - \ No newline at end of file + + + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_albums_as_keywords.xmp b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_albums_as_keywords.xmp index f8a26dac..6a8c4399 100644 --- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_albums_as_keywords.xmp +++ b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_albums_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Wedding tulips + Wedding tulips @@ -17,31 +17,46 @@ - flowers - wedding + flowers + wedding 2019-07-04T16:24:01-04:00 - - - - + + + + - - flowers - wedding - + + flowers + wedding + - - + + 2019-07-04T16:24:01 2019-07-04T16:24:01 - - - - - \ No newline at end of file + + + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_ext.xmp b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_ext.xmp index f8a26dac..6a8c4399 100644 --- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_ext.xmp +++ b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_ext.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Wedding tulips + Wedding tulips @@ -17,31 +17,46 @@ - flowers - wedding + flowers + wedding 2019-07-04T16:24:01-04:00 - - - - + + + + - - flowers - wedding - + + flowers + wedding + - - + + 2019-07-04T16:24:01 2019-07-04T16:24:01 - - - - - \ No newline at end of file + + + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_keyword_template.xmp b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_keyword_template.xmp index 824614a1..af6b3fa2 100644 --- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_keyword_template.xmp +++ b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_keyword_template.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Wedding tulips + Wedding tulips @@ -17,33 +17,48 @@ - 2019 - flowers - wedding + 2019 + flowers + wedding 2019-07-04T16:24:01-04:00 - - - - + + + + - - 2019 - flowers - wedding - + + 2019 + flowers + wedding + - - + + 2019-07-04T16:24:01 2019-07-04T16:24:01 - - - - - \ No newline at end of file + + + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_persons_as_keywords.xmp b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_persons_as_keywords.xmp index f8a26dac..6a8c4399 100644 --- a/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_persons_as_keywords.xmp +++ b/tests/sidecars/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_persons_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Wedding tulips + Wedding tulips @@ -17,31 +17,46 @@ - flowers - wedding + flowers + wedding 2019-07-04T16:24:01-04:00 - - - - + + + + - - flowers - wedding - + + flowers + wedding + - - + + 2019-07-04T16:24:01 2019-07-04T16:24:01 - - - - - \ No newline at end of file + + + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.xmp b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.xmp index 80e7acaf..8fad3ac8 100644 --- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.xmp +++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Bride Wedding day + Bride Wedding day @@ -17,34 +17,80 @@ - wedding + wedding 2019-04-15T14:40:24.086000-04:00 - - + + - - Maria - + + Maria + - - + + - - wedding - + + wedding + - - + + 2019-04-15T14:40:24 2019-04-15T14:40:24 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.393892 + 0.342010 + 0.402300 + 0.413794 + normalized + + Maria + 0.1819758117198944 + Face + + + + + + + + + + + Maria + 0.231295, 0.216848, 0.342010, 0.393892 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.xmp b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.xmp index 80e7acaf..8fad3ac8 100644 --- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.xmp +++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Bride Wedding day + Bride Wedding day @@ -17,34 +17,80 @@ - wedding + wedding 2019-04-15T14:40:24.086000-04:00 - - + + - - Maria - + + Maria + - - + + - - wedding - + + wedding + - - + + 2019-04-15T14:40:24 2019-04-15T14:40:24 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.393892 + 0.342010 + 0.402300 + 0.413794 + normalized + + Maria + 0.1819758117198944 + Face + + + + + + + + + + + Maria + 0.231295, 0.216848, 0.342010, 0.393892 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ext.xmp b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ext.xmp index 80e7acaf..8fad3ac8 100644 --- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ext.xmp +++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ext.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Bride Wedding day + Bride Wedding day @@ -17,34 +17,80 @@ - wedding + wedding 2019-04-15T14:40:24.086000-04:00 - - + + - - Maria - + + Maria + - - + + - - wedding - + + wedding + - - + + 2019-04-15T14:40:24 2019-04-15T14:40:24 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.393892 + 0.342010 + 0.402300 + 0.413794 + normalized + + Maria + 0.1819758117198944 + Face + + + + + + + + + + + Maria + 0.231295, 0.216848, 0.342010, 0.393892 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.xmp b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.xmp index 83439c42..e35e1a3e 100644 --- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.xmp +++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Bride Wedding day + Bride Wedding day @@ -17,36 +17,82 @@ - 2019 - wedding + 2019 + wedding 2019-04-15T14:40:24.086000-04:00 - - + + - - Maria - + + Maria + - - + + - - 2019 - wedding - + + 2019 + wedding + - - + + 2019-04-15T14:40:24 2019-04-15T14:40:24 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.393892 + 0.342010 + 0.402300 + 0.413794 + normalized + + Maria + 0.1819758117198944 + Face + + + + + + + + + + + Maria + 0.231295, 0.216848, 0.342010, 0.393892 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.xmp b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.xmp index fe0d4c9e..5b46e2e3 100644 --- a/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.xmp +++ b/tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Bride Wedding day + Bride Wedding day @@ -17,36 +17,82 @@ - Maria - wedding + Maria + wedding 2019-04-15T14:40:24.086000-04:00 - - + + - - Maria - + + Maria + - - + + - - Maria - wedding - + + Maria + wedding + - - + + 2019-04-15T14:40:24 2019-04-15T14:40:24 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.393892 + 0.342010 + 0.402300 + 0.413794 + normalized + + Maria + 0.1819758117198944 + Face + + + + + + + + + + + Maria + 0.231295, 0.216848, 0.342010, 0.393892 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng.xmp b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng.xmp index eefbf799..34ba66c2 100644 --- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng.xmp +++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girls with pumpkins + Girls with pumpkins @@ -17,35 +17,97 @@ - Kids + Kids 2018-09-28T15:35:49.063000-04:00 - - + + - - Katie - Suzy - + + Katie + Suzy + - - + + - - Kids - + + Kids + - - + + 2018-09-28T15:35:49 2018-09-28T15:35:49 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.111950 + 0.074615 + 0.309784 + 0.335536 + normalized + + Suzy + 0.09641068428754807 + Face + + + + 0.075018 + 0.050000 + 0.712673 + 0.423987 + normalized + + Katie + 0 + Face + + + + + + + + + + + Suzy + 0.272476, 0.279561, 0.074615, 0.111950 + + + Katie + 0.687673, 0.386478, 0.050000, 0.075018 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.xmp b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.xmp index 1da407f7..b33de0c8 100644 --- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.xmp +++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girls with pumpkins + Girls with pumpkins @@ -17,39 +17,101 @@ - Kids - Pumpkin Farm - Test Album + Kids + Pumpkin Farm + Test Album 2018-09-28T15:35:49.063000-04:00 - - + + - - Katie - Suzy - + + Katie + Suzy + - - + + - - Kids - Pumpkin Farm - Test Album - + + Kids + Pumpkin Farm + Test Album + - - + + 2018-09-28T15:35:49 2018-09-28T15:35:49 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.111950 + 0.074615 + 0.309784 + 0.335536 + normalized + + Suzy + 0.09641068428754807 + Face + + + + 0.075018 + 0.050000 + 0.712673 + 0.423987 + normalized + + Katie + 0 + Face + + + + + + + + + + + Suzy + 0.272476, 0.279561, 0.074615, 0.111950 + + + Katie + 0.687673, 0.386478, 0.050000, 0.075018 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ext.xmp b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ext.xmp index eefbf799..34ba66c2 100644 --- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ext.xmp +++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ext.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girls with pumpkins + Girls with pumpkins @@ -17,35 +17,97 @@ - Kids + Kids 2018-09-28T15:35:49.063000-04:00 - - + + - - Katie - Suzy - + + Katie + Suzy + - - + + - - Kids - + + Kids + - - + + 2018-09-28T15:35:49 2018-09-28T15:35:49 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.111950 + 0.074615 + 0.309784 + 0.335536 + normalized + + Suzy + 0.09641068428754807 + Face + + + + 0.075018 + 0.050000 + 0.712673 + 0.423987 + normalized + + Katie + 0 + Face + + + + + + + + + + + Suzy + 0.272476, 0.279561, 0.074615, 0.111950 + + + Katie + 0.687673, 0.386478, 0.050000, 0.075018 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_keyword_template.xmp b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_keyword_template.xmp index 9d8ebc36..9ae567c9 100644 --- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_keyword_template.xmp +++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_keyword_template.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girls with pumpkins + Girls with pumpkins @@ -17,41 +17,103 @@ - 2018 - Kids - Pumpkin Farm - Test Album + 2018 + Kids + Pumpkin Farm + Test Album 2018-09-28T15:35:49.063000-04:00 - - + + - - Katie - Suzy - + + Katie + Suzy + - - + + - - 2018 - Kids - Pumpkin Farm - Test Album - + + 2018 + Kids + Pumpkin Farm + Test Album + - - + + 2018-09-28T15:35:49 2018-09-28T15:35:49 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.111950 + 0.074615 + 0.309784 + 0.335536 + normalized + + Suzy + 0.09641068428754807 + Face + + + + 0.075018 + 0.050000 + 0.712673 + 0.423987 + normalized + + Katie + 0 + Face + + + + + + + + + + + Suzy + 0.272476, 0.279561, 0.074615, 0.111950 + + + Katie + 0.687673, 0.386478, 0.050000, 0.075018 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.xmp b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.xmp index 51694ba9..d5b8a6ad 100644 --- a/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.xmp +++ b/tests/sidecars/8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girls with pumpkins + Girls with pumpkins @@ -17,39 +17,101 @@ - Katie - Kids - Suzy + Katie + Kids + Suzy 2018-09-28T15:35:49.063000-04:00 - - + + - - Katie - Suzy - + + Katie + Suzy + - - + + - - Katie - Kids - Suzy - + + Katie + Kids + Suzy + - - + + 2018-09-28T15:35:49 2018-09-28T15:35:49 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.111950 + 0.074615 + 0.309784 + 0.335536 + normalized + + Suzy + 0.09641068428754807 + Face + + + + 0.075018 + 0.050000 + 0.712673 + 0.423987 + normalized + + Katie + 0 + Face + + + + + + + + + + + Suzy + 0.272476, 0.279561, 0.074615, 0.111950 + + + Katie + 0.687673, 0.386478, 0.050000, 0.075018 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C.xmp b/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C.xmp index 893b24e9..5f27d3e9 100644 --- a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C.xmp +++ b/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - + @@ -17,29 +17,44 @@ - Kids + Kids 2018-09-28T15:39:59.008000-04:00 - - - - + + + + - - Kids - + + Kids + - - + + 2018-09-28T15:39:59 2018-09-28T15:39:59 - - - - - \ No newline at end of file + + + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_albums_as_keywords.xmp b/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_albums_as_keywords.xmp index 893b24e9..5f27d3e9 100644 --- a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_albums_as_keywords.xmp +++ b/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_albums_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - + @@ -17,29 +17,44 @@ - Kids + Kids 2018-09-28T15:39:59.008000-04:00 - - - - + + + + - - Kids - + + Kids + - - + + 2018-09-28T15:39:59 2018-09-28T15:39:59 - - - - - \ No newline at end of file + + + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_ext.xmp b/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_ext.xmp index 893b24e9..5f27d3e9 100644 --- a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_ext.xmp +++ b/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_ext.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - + @@ -17,29 +17,44 @@ - Kids + Kids 2018-09-28T15:39:59.008000-04:00 - - - - + + + + - - Kids - + + Kids + - - + + 2018-09-28T15:39:59 2018-09-28T15:39:59 - - - - - \ No newline at end of file + + + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_keyword_template.xmp b/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_keyword_template.xmp index 0f1606c5..175731c3 100644 --- a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_keyword_template.xmp +++ b/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_keyword_template.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - + @@ -17,31 +17,46 @@ - 2018 - Kids + 2018 + Kids 2018-09-28T15:39:59.008000-04:00 - - - - + + + + - - 2018 - Kids - + + 2018 + Kids + - - + + 2018-09-28T15:39:59 2018-09-28T15:39:59 - - - - - \ No newline at end of file + + + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_persons_as_keywords.xmp b/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_persons_as_keywords.xmp index 893b24e9..5f27d3e9 100644 --- a/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_persons_as_keywords.xmp +++ b/tests/sidecars/A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_persons_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - + @@ -17,29 +17,44 @@ - Kids + Kids 2018-09-28T15:39:59.008000-04:00 - - - - + + + + - - Kids - + + Kids + - - + + 2018-09-28T15:39:59 2018-09-28T15:39:59 - - - - - \ No newline at end of file + + + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B.xmp b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B.xmp index e91b9086..8007d68f 100644 --- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B.xmp +++ b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girl holding pumpkin + Girl holding pumpkin @@ -17,36 +17,82 @@ - Kids + Kids 2018-09-28T16:07:07-04:00 - - + + - - Katie - + + Katie + - - + + - - Kids - + + Kids + - - + + 2018-09-28T16:07:07 2018-09-28T16:07:07 - - + + 95,56.415420000000154W 41,15.393959999999964N - - - \ No newline at end of file + + + 1 + + + + + pixel + + + + + + 0.149375 + 0.224117 + 0.589819 + 0.281643 + normalized + + Katie + 0.0 + Face + + + + + + + + + + + Katie + 0.477761, 0.206955, 0.224117, 0.149375 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_albums_as_keywords.xmp b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_albums_as_keywords.xmp index 8824a77a..d9491f22 100644 --- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_albums_as_keywords.xmp +++ b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_albums_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girl holding pumpkin + Girl holding pumpkin @@ -17,40 +17,86 @@ - Kids - Pumpkin Farm - Test Album + Kids + Pumpkin Farm + Test Album 2018-09-28T16:07:07-04:00 - - + + - - Katie - + + Katie + - - + + - - Kids - Pumpkin Farm - Test Album - + + Kids + Pumpkin Farm + Test Album + - - + + 2018-09-28T16:07:07 2018-09-28T16:07:07 - - + + 95,56.415420000000154W 41,15.393959999999964N - - - \ No newline at end of file + + + 1 + + + + + pixel + + + + + + 0.149375 + 0.224117 + 0.589819 + 0.281643 + normalized + + Katie + 0.0 + Face + + + + + + + + + + + Katie + 0.477761, 0.206955, 0.224117, 0.149375 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_ext.xmp b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_ext.xmp index e91b9086..8007d68f 100644 --- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_ext.xmp +++ b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_ext.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girl holding pumpkin + Girl holding pumpkin @@ -17,36 +17,82 @@ - Kids + Kids 2018-09-28T16:07:07-04:00 - - + + - - Katie - + + Katie + - - + + - - Kids - + + Kids + - - + + 2018-09-28T16:07:07 2018-09-28T16:07:07 - - + + 95,56.415420000000154W 41,15.393959999999964N - - - \ No newline at end of file + + + 1 + + + + + pixel + + + + + + 0.149375 + 0.224117 + 0.589819 + 0.281643 + normalized + + Katie + 0.0 + Face + + + + + + + + + + + Katie + 0.477761, 0.206955, 0.224117, 0.149375 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_keyword_template.xmp b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_keyword_template.xmp index 33161448..b8183561 100644 --- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_keyword_template.xmp +++ b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_keyword_template.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girl holding pumpkin + Girl holding pumpkin @@ -17,42 +17,88 @@ - 2018 - Kids - Pumpkin Farm - Test Album + 2018 + Kids + Pumpkin Farm + Test Album 2018-09-28T16:07:07-04:00 - - + + - - Katie - + + Katie + - - + + - - 2018 - Kids - Pumpkin Farm - Test Album - + + 2018 + Kids + Pumpkin Farm + Test Album + - - + + 2018-09-28T16:07:07 2018-09-28T16:07:07 - - + + 95,56.415420000000154W 41,15.393959999999964N - - - \ No newline at end of file + + + 1 + + + + + pixel + + + + + + 0.149375 + 0.224117 + 0.589819 + 0.281643 + normalized + + Katie + 0.0 + Face + + + + + + + + + + + Katie + 0.477761, 0.206955, 0.224117, 0.149375 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_persons_as_keywords.xmp b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_persons_as_keywords.xmp index 7d600e0f..a30e920a 100644 --- a/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_persons_as_keywords.xmp +++ b/tests/sidecars/D79B8D77-BFFC-460B-9312-034F2877D35B_persons_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girl holding pumpkin + Girl holding pumpkin @@ -17,38 +17,84 @@ - Katie - Kids + Katie + Kids 2018-09-28T16:07:07-04:00 - - + + - - Katie - + + Katie + - - + + - - Katie - Kids - + + Katie + Kids + - - + + 2018-09-28T16:07:07 2018-09-28T16:07:07 - - + + 95,56.415420000000154W 41,15.393959999999964N - - - \ No newline at end of file + + + 1 + + + + + pixel + + + + + + 0.149375 + 0.224117 + 0.589819 + 0.281643 + normalized + + Katie + 0.0 + Face + + + + + + + + + + + Katie + 0.477761, 0.206955, 0.224117, 0.149375 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30.xmp b/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30.xmp index 87fd86ea..cec3ae68 100644 --- a/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30.xmp +++ b/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - + @@ -17,41 +17,56 @@ - England - London - London 2018 - St. James's Park - UK - United Kingdom + England + London + London 2018 + St. James's Park + UK + United Kingdom 2018-10-13T09:18:12.501000-04:00 - - - - + + + + - - England - London - London 2018 - St. James's Park - UK - United Kingdom - + + England + London + London 2018 + St. James's Park + UK + United Kingdom + - - + + 2018-10-13T09:18:12 2018-10-13T09:18:12 - - + + 0,7.908329999999999W 51,30.21430019999997N - - - \ No newline at end of file + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_albums_as_keywords.xmp b/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_albums_as_keywords.xmp index 87fd86ea..cec3ae68 100644 --- a/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_albums_as_keywords.xmp +++ b/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_albums_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - + @@ -17,41 +17,56 @@ - England - London - London 2018 - St. James's Park - UK - United Kingdom + England + London + London 2018 + St. James's Park + UK + United Kingdom 2018-10-13T09:18:12.501000-04:00 - - - - + + + + - - England - London - London 2018 - St. James's Park - UK - United Kingdom - + + England + London + London 2018 + St. James's Park + UK + United Kingdom + - - + + 2018-10-13T09:18:12 2018-10-13T09:18:12 - - + + 0,7.908329999999999W 51,30.21430019999997N - - - \ No newline at end of file + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_ext.xmp b/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_ext.xmp index 87fd86ea..cec3ae68 100644 --- a/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_ext.xmp +++ b/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_ext.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - + @@ -17,41 +17,56 @@ - England - London - London 2018 - St. James's Park - UK - United Kingdom + England + London + London 2018 + St. James's Park + UK + United Kingdom 2018-10-13T09:18:12.501000-04:00 - - - - + + + + - - England - London - London 2018 - St. James's Park - UK - United Kingdom - + + England + London + London 2018 + St. James's Park + UK + United Kingdom + - - + + 2018-10-13T09:18:12 2018-10-13T09:18:12 - - + + 0,7.908329999999999W 51,30.21430019999997N - - - \ No newline at end of file + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_keyword_template.xmp b/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_keyword_template.xmp index 357429f9..4abb9a9c 100644 --- a/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_keyword_template.xmp +++ b/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_keyword_template.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - + @@ -17,43 +17,58 @@ - 2018 - England - London - London 2018 - St. James's Park - UK - United Kingdom + 2018 + England + London + London 2018 + St. James's Park + UK + United Kingdom 2018-10-13T09:18:12.501000-04:00 - - - - + + + + - - 2018 - England - London - London 2018 - St. James's Park - UK - United Kingdom - + + 2018 + England + London + London 2018 + St. James's Park + UK + United Kingdom + - - + + 2018-10-13T09:18:12 2018-10-13T09:18:12 - - + + 0,7.908329999999999W 51,30.21430019999997N - - - \ No newline at end of file + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_persons_as_keywords.xmp b/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_persons_as_keywords.xmp index 87fd86ea..cec3ae68 100644 --- a/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_persons_as_keywords.xmp +++ b/tests/sidecars/DC99FBDD-7A52-4100-A5BB-344131646C30_persons_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - + @@ -17,41 +17,56 @@ - England - London - London 2018 - St. James's Park - UK - United Kingdom + England + London + London 2018 + St. James's Park + UK + United Kingdom 2018-10-13T09:18:12.501000-04:00 - - - - + + + + - - England - London - London 2018 - St. James's Park - UK - United Kingdom - + + England + London + London 2018 + St. James's Park + UK + United Kingdom + - - + + 2018-10-13T09:18:12 2018-10-13T09:18:12 - - + + 0,7.908329999999999W 51,30.21430019999997N - - - \ No newline at end of file + + + 1 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.xmp b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.xmp index fe0d4c9e..1f1d9f48 100644 --- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.xmp +++ b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Bride Wedding day + Bride Wedding day @@ -17,36 +17,82 @@ - Maria - wedding + Maria + wedding 2019-04-15T14:40:24.086000-04:00 - - + + - - Maria - + + Maria + - - + + - - Maria - wedding - + + Maria + wedding + - - + + 2019-04-15T14:40:24 2019-04-15T14:40:24 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.383900 + 0.333334 + 0.412230 + 0.422169 + normalized + + Maria + 0.0 + Face + + + + + + + + + + + Maria + 0.245562, 0.230219, 0.333334, 0.383900 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_albums_as_keywords.xmp b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_albums_as_keywords.xmp index 60d724eb..aae836c1 100644 --- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_albums_as_keywords.xmp +++ b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_albums_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Bride Wedding day + Bride Wedding day @@ -17,40 +17,86 @@ - AlbumInFolder - I have a deleted twin - Maria - wedding + AlbumInFolder + I have a deleted twin + Maria + wedding 2019-04-15T14:40:24.086000-04:00 - - + + - - Maria - + + Maria + - - + + - - AlbumInFolder - I have a deleted twin - Maria - wedding - + + AlbumInFolder + I have a deleted twin + Maria + wedding + - - + + 2019-04-15T14:40:24 2019-04-15T14:40:24 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.383900 + 0.333334 + 0.412230 + 0.422169 + normalized + + Maria + 0.0 + Face + + + + + + + + + + + Maria + 0.245562, 0.230219, 0.333334, 0.383900 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_ext.xmp b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_ext.xmp index fe0d4c9e..1f1d9f48 100644 --- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_ext.xmp +++ b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_ext.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Bride Wedding day + Bride Wedding day @@ -17,36 +17,82 @@ - Maria - wedding + Maria + wedding 2019-04-15T14:40:24.086000-04:00 - - + + - - Maria - + + Maria + - - + + - - Maria - wedding - + + Maria + wedding + - - + + 2019-04-15T14:40:24 2019-04-15T14:40:24 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.383900 + 0.333334 + 0.412230 + 0.422169 + normalized + + Maria + 0.0 + Face + + + + + + + + + + + Maria + 0.245562, 0.230219, 0.333334, 0.383900 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_keyword_template.xmp b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_keyword_template.xmp index 0ba0e481..da5b6d16 100644 --- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_keyword_template.xmp +++ b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_keyword_template.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Bride Wedding day + Bride Wedding day @@ -17,42 +17,88 @@ - 2019 - Folder1/SubFolder2/AlbumInFolder - I have a deleted twin - Maria - wedding + 2019 + Folder1/SubFolder2/AlbumInFolder + I have a deleted twin + Maria + wedding 2019-04-15T14:40:24.086000-04:00 - - + + - - Maria - + + Maria + - - + + - - 2019 - Folder1/SubFolder2/AlbumInFolder - I have a deleted twin - Maria - wedding - + + 2019 + Folder1/SubFolder2/AlbumInFolder + I have a deleted twin + Maria + wedding + - - + + 2019-04-15T14:40:24 2019-04-15T14:40:24 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.383900 + 0.333334 + 0.412230 + 0.422169 + normalized + + Maria + 0.0 + Face + + + + + + + + + + + Maria + 0.245562, 0.230219, 0.333334, 0.383900 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_persons_as_keywords.xmp b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_persons_as_keywords.xmp index fe0d4c9e..1f1d9f48 100644 --- a/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_persons_as_keywords.xmp +++ b/tests/sidecars/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_persons_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Bride Wedding day + Bride Wedding day @@ -17,36 +17,82 @@ - Maria - wedding + Maria + wedding 2019-04-15T14:40:24.086000-04:00 - - + + - - Maria - + + Maria + - - + + - - Maria - wedding - + + Maria + wedding + - - + + 2019-04-15T14:40:24 2019-04-15T14:40:24 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.383900 + 0.333334 + 0.412230 + 0.422169 + normalized + + Maria + 0.0 + Face + + + + + + + + + + + Maria + 0.245562, 0.230219, 0.333334, 0.383900 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E.xmp b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E.xmp index eefbf799..fada2af6 100644 --- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E.xmp +++ b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girls with pumpkins + Girls with pumpkins @@ -17,35 +17,97 @@ - Kids + Kids 2018-09-28T15:35:49.063000-04:00 - - + + - - Katie - Suzy - + + Katie + Suzy + - - + + - - Kids - + + Kids + - - + + 2018-09-28T15:35:49 2018-09-28T15:35:49 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.111174 + 0.074098 + 0.320504 + 0.335665 + normalized + + Suzy + 0.0 + Face + + + + 0.093038 + 0.062010 + 0.715818 + 0.420902 + normalized + + Katie + 0.5235987901687622 + Face + + + + + + + + + + + Suzy + 0.283455, 0.280079, 0.074098, 0.111174 + + + Katie + 0.684813, 0.374384, 0.062010, 0.093038 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_albums_as_keywords.xmp b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_albums_as_keywords.xmp index 1da407f7..1bed9fe1 100644 --- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_albums_as_keywords.xmp +++ b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_albums_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girls with pumpkins + Girls with pumpkins @@ -17,39 +17,101 @@ - Kids - Pumpkin Farm - Test Album + Kids + Pumpkin Farm + Test Album 2018-09-28T15:35:49.063000-04:00 - - + + - - Katie - Suzy - + + Katie + Suzy + - - + + - - Kids - Pumpkin Farm - Test Album - + + Kids + Pumpkin Farm + Test Album + - - + + 2018-09-28T15:35:49 2018-09-28T15:35:49 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.111174 + 0.074098 + 0.320504 + 0.335665 + normalized + + Suzy + 0.0 + Face + + + + 0.093038 + 0.062010 + 0.715818 + 0.420902 + normalized + + Katie + 0.5235987901687622 + Face + + + + + + + + + + + Suzy + 0.283455, 0.280079, 0.074098, 0.111174 + + + Katie + 0.684813, 0.374384, 0.062010, 0.093038 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_ext.xmp b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_ext.xmp index eefbf799..fada2af6 100644 --- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_ext.xmp +++ b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_ext.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girls with pumpkins + Girls with pumpkins @@ -17,35 +17,97 @@ - Kids + Kids 2018-09-28T15:35:49.063000-04:00 - - + + - - Katie - Suzy - + + Katie + Suzy + - - + + - - Kids - + + Kids + - - + + 2018-09-28T15:35:49 2018-09-28T15:35:49 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.111174 + 0.074098 + 0.320504 + 0.335665 + normalized + + Suzy + 0.0 + Face + + + + 0.093038 + 0.062010 + 0.715818 + 0.420902 + normalized + + Katie + 0.5235987901687622 + Face + + + + + + + + + + + Suzy + 0.283455, 0.280079, 0.074098, 0.111174 + + + Katie + 0.684813, 0.374384, 0.062010, 0.093038 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_keyword_template.xmp b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_keyword_template.xmp index 9d8ebc36..493eca63 100644 --- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_keyword_template.xmp +++ b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_keyword_template.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girls with pumpkins + Girls with pumpkins @@ -17,41 +17,103 @@ - 2018 - Kids - Pumpkin Farm - Test Album + 2018 + Kids + Pumpkin Farm + Test Album 2018-09-28T15:35:49.063000-04:00 - - + + - - Katie - Suzy - + + Katie + Suzy + - - + + - - 2018 - Kids - Pumpkin Farm - Test Album - + + 2018 + Kids + Pumpkin Farm + Test Album + - - + + 2018-09-28T15:35:49 2018-09-28T15:35:49 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.111174 + 0.074098 + 0.320504 + 0.335665 + normalized + + Suzy + 0.0 + Face + + + + 0.093038 + 0.062010 + 0.715818 + 0.420902 + normalized + + Katie + 0.5235987901687622 + Face + + + + + + + + + + + Suzy + 0.283455, 0.280079, 0.074098, 0.111174 + + + Katie + 0.684813, 0.374384, 0.062010, 0.093038 + + + + + + + + \ No newline at end of file diff --git a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_persons_as_keywords.xmp b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_persons_as_keywords.xmp index 51694ba9..1d75fa76 100644 --- a/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_persons_as_keywords.xmp +++ b/tests/sidecars/F12384F6-CD17-4151-ACBA-AE0E3688539E_persons_as_keywords.xmp @@ -1,13 +1,13 @@ - - - - + + + + jpg - Girls with pumpkins + Girls with pumpkins @@ -17,39 +17,101 @@ - Katie - Kids - Suzy + Katie + Kids + Suzy 2018-09-28T15:35:49.063000-04:00 - - + + - - Katie - Suzy - + + Katie + Suzy + - - + + - - Katie - Kids - Suzy - + + Katie + Kids + Suzy + - - + + 2018-09-28T15:35:49 2018-09-28T15:35:49 - - - - - \ No newline at end of file + + + + + 1 + + + + + pixel + + + + + + 0.111174 + 0.074098 + 0.320504 + 0.335665 + normalized + + Suzy + 0.0 + Face + + + + 0.093038 + 0.062010 + 0.715818 + 0.420902 + normalized + + Katie + 0.5235987901687622 + Face + + + + + + + + + + + Suzy + 0.283455, 0.280079, 0.074098, 0.111174 + + + Katie + 0.684813, 0.374384, 0.062010, 0.093038 + + + + + + + + \ No newline at end of file diff --git a/tests/test_faceinfo.py b/tests/test_faceinfo.py index 0254a0d1..5e5b8f4d 100644 --- a/tests/test_faceinfo.py +++ b/tests/test_faceinfo.py @@ -2,7 +2,7 @@ import pytest -PHOTOS_DB_5 = "tests/Test-Faces-10.15.6.photoslibrary" +PHOTOS_DB_5 = "tests/Test-Faces-10.15.7.photoslibrary" PHOTOS_DB_4 = "tests/Test-Faces-10.14.6.photoslibrary" UUID_NO_FACE_4 = "et+K1HHhT8+I64oIGy6sxg" @@ -1372,6 +1372,68 @@ UUID_LIST_4 = [ ] UUID_LIST_5 = [ + { + "41581532-858D-4767-ADA8-9D26C52FCB96": { + "2DBD01FF-EC8F-4757-8F9E-D5F6AB6EC963": { + "_pk": 5, + "uuid": "2DBD01FF-EC8F-4757-8F9E-D5F6AB6EC963", + "name": "Exif", + "asset_uuid": "41581532-858D-4767-ADA8-9D26C52FCB96", + "_person_pk": 16, + "center_x": 0.506168320775032, + "center_y": 0.4063185453414917, + "center": (555, 1036), + "mouth_x": 0.49372094131355543, + "mouth_y": 0.28159753170711355, + "mouth": (384, 1011), + "left_eye_x": 0.43724246548613566, + "left_eye_y": 0.5224152194593512, + "left_eye": (714, 895), + "right_eye_x": 0.544619582741027, + "right_eye_y": 0.557959678001068, + "right_eye": (762, 1115), + "size": 0.3950786292552948, + "face_rect": [ + (150.43948364257812, 631.4394836425781), + (959.5605163574219, 1440.5605163574219), + ], + "mpri_reg_rect": { + "x": 0.1103708376915854, + "y": 0.30862900614738464, + "h": 0.5918954152998126, + "w": 0.3950786292552948, + }, + "mwg_rs_area": { + "x": 0.4063185453414917, + "y": 0.506168320775032, + "h": 0.3950786292552948, + "w": 0.5918954152998126, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": 0.6100583076477051, + "source_width": 2048, + "source_height": 1367, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 0, + "face_type": None, + "age_type": 3, + "bald_type": 3, + "eye_makeup_type": 0, + "eye_state": 2, + "facial_hair_type": 1, + "gender_type": 2, + "glasses_type": 3, + "hair_color_type": 1, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 2, + } + } + }, { "8C5431B3-5F59-4B5F-855A-021408C519E4": { "1F542CBF-BE11-4ACB-A553-FABF81391C97": { @@ -1435,172 +1497,168 @@ UUID_LIST_5 = [ } }, { - "74A8D2AD-4A95-402C-AB41-8948B6268DDE": { - "3564F47E-BE04-4EF2-9409-7F0AFC3C6C90": { - "_pk": 12, - "uuid": "3564F47E-BE04-4EF2-9409-7F0AFC3C6C90", + "E7B8ED9C-314E-4459-895D-6BDC6B7D8F6C": { + "975FE274-A15A-45A2-B12C-031343448048": { + "_pk": 45, + "uuid": "975FE274-A15A-45A2-B12C-031343448048", + "name": "left8", + "asset_uuid": "E7B8ED9C-314E-4459-895D-6BDC6B7D8F6C", + "_person_pk": 48, + "center_x": 0.3113360471918876, + "center_y": 0.6745229809192367, + "center": (920, 637), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (0, 0), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (0, 0), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (0, 0), + "size": 0.0907672643661499, + "face_rect": [ + (827.0543212890625, 544.0543212890625), + (1012.9456787109375, 729.9456787109375), + ], + "mpri_reg_rect": { + "x": 0.6064309086035315, + "y": 0.26595241500881267, + "h": 0.13618414463141026, + "w": 0.0907672643661499, + }, + "mwg_rs_area": { + "x": 0.6745229809192367, + "y": 0.3113360471918876, + "h": 0.0907672643661499, + "w": 0.13618414463141026, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 2048, + "source_height": 1365, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + }, + "05BC1A65-9743-4B8E-9A10-1A0B78E3E949": { + "_pk": 46, + "uuid": "05BC1A65-9743-4B8E-9A10-1A0B78E3E949", + "name": "right8", + "asset_uuid": "E7B8ED9C-314E-4459-895D-6BDC6B7D8F6C", + "_person_pk": 49, + "center_x": 0.7171411856474258, + "center_y": 0.5784734246512717, + "center": (789, 1468), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (0, 0), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (0, 0), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (0, 0), + "size": 0.08651255071163177, + "face_rect": [ + (700.4111480712891, 1379.411148071289), + (877.5888519287109, 1556.588851928711), + ], + "mpri_reg_rect": { + "x": 0.5135731668280402, + "y": 0.6738849102916099, + "h": 0.12980051564646292, + "w": 0.08651255071163177, + }, + "mwg_rs_area": { + "x": 0.5784734246512717, + "y": 0.7171411856474258, + "h": 0.08651255071163177, + "w": 0.12980051564646292, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 2048, + "source_height": 1365, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + }, + } + }, + { + "74C3C5B5-F9EB-4527-A03F-8064B1496542": { + "B552E117-9419-441A-B772-36F3C798C1FF": { + "_pk": 16, + "uuid": "B552E117-9419-441A-B772-36F3C798C1FF", "name": "", - "asset_uuid": "74A8D2AD-4A95-402C-AB41-8948B6268DDE", - "_person_pk": 9, - "center_x": 0.4150405116379261, - "center_y": 0.3804657310247421, - "center": (498, 991), - "mouth_x": 0.35514891692551487, - "mouth_y": 0.28526406607189375, - "mouth": (426, 1143), - "left_eye_x": 0.24532392920940715, - "left_eye_y": 0.5437179133602399, - "left_eye": (294, 730), - "right_eye_x": 0.5664884610123178, - "right_eye_y": 0.5198140024518239, - "right_eye": (679, 768), - "size": 0.5623092949390411, + "asset_uuid": "74C3C5B5-F9EB-4527-A03F-8064B1496542", + "_person_pk": 4, + "center_x": 0.5952992588281631, + "center_y": 0.49017810821533203, + "center": (1219, 687), + "mouth_x": 0.5881596664819962, + "mouth_y": 0.3549293373939501, + "mouth": (1204, 869), + "left_eye_x": 0.5232154194375097, + "left_eye_y": 0.6100698135934515, + "left_eye": (1071, 525), + "right_eye_x": 0.6608530058804294, + "right_eye_y": 0.6057527381688228, + "right_eye": (1353, 531), + "size": 0.36225399374961853, "face_rect": [ - (48.15256404876709, 541.1525640487671), - (947.8474359512329, 1440.847435951233), + (848.0519104003906, 316.0519104003906), + (1589.9480895996094, 1057.9480895996094), ], "mpri_reg_rect": { - "x": 0.04016764834523201, - "y": 0.3383796215057373, - "h": 0.7497457265853882, - "w": 0.5623092949390411, + "x": 0.4141722619533539, + "y": 0.2346378490549874, + "h": 0.36225399374961853, + "w": 0.5503680854593611, }, "mwg_rs_area": { - "x": 0.4150405116379261, - "y": 0.6195342689752579, - "h": 0.5623092949390411, - "w": 0.7497457265853882, + "x": 0.5952992588281631, + "y": 0.509821891784668, + "h": 0.5503680854593611, + "w": 0.36225399374961853, }, "roll": 0.0, "pitch": 0.0, "yaw": 0.0, - "quality": 0.5376036167144775, - "source_width": 1200, - "source_height": 1600, - "has_smile": 0, - "left_eye_closed": 0, - "right_eye_closed": 0, - "manual": 0, - "face_type": None, - "age_type": 3, - "bald_type": 3, - "eye_makeup_type": 0, - "eye_state": 2, - "facial_hair_type": 1, - "gender_type": 1, - "glasses_type": 3, - "hair_color_type": 5, - "intrash": 0, - "lip_makeup_type": 0, - "smile_type": 2, - } - } - }, - { - "94D0440B-28BD-4724-89BD-A53662F57CC6": { - "03646A62-5D84-4425-BA83-0EE4EBA279C4": { - "_pk": 10, - "uuid": "03646A62-5D84-4425-BA83-0EE4EBA279C4", - "name": "Exif", - "asset_uuid": "94D0440B-28BD-4724-89BD-A53662F57CC6", - "_person_pk": 16, - "center_x": 0.5034043937921524, - "center_y": 0.40654684603214264, - "center": (1017, 555), - "mouth_x": 0.49383093682306267, - "mouth_y": 0.2808416709048345, - "mouth": (1036, 383), - "left_eye_x": 0.4368750899788476, - "left_eye_y": 0.5222734803531885, - "left_eye": (1153, 713), - "right_eye_x": 0.5449226343292468, - "right_eye_y": 0.5579434879607916, - "right_eye": (931, 762), - "size": 0.39579104888252914, - "face_rect": [ - (611.7099659442902, 149.70996594429016), - (1422.2900340557098, 960.2900340557098), - ], - "mpri_reg_rect": { - "x": 0.298700081766583, - "y": 0.11006547510623932, - "h": 0.39579104888252914, - "w": 0.5929627418518066, - }, - "mwg_rs_area": { - "x": 0.4965956062078476, - "y": 0.40654684603214264, - "h": 0.5929627418518066, - "w": 0.39579104888252914, - }, - "roll": 0.0, - "pitch": 0.0, - "yaw": 0.0, - "quality": 0.6154575347900391, + "quality": 0.6104320287704468, "source_width": 2048, - "source_height": 1367, - "has_smile": 0, - "left_eye_closed": 0, - "right_eye_closed": 0, - "manual": 0, - "face_type": None, - "age_type": 3, - "bald_type": 3, - "eye_makeup_type": 0, - "eye_state": 2, - "facial_hair_type": 1, - "gender_type": 2, - "glasses_type": 3, - "hair_color_type": 1, - "intrash": 0, - "lip_makeup_type": 0, - "smile_type": 2, - } - } - }, - { - "554B190D-B064-479F-89CB-EB2485C3675F": { - "47BA92F0-2083-4AAE-AB79-B741FF8FDEAA": { - "_pk": 17, - "uuid": "47BA92F0-2083-4AAE-AB79-B741FF8FDEAA", - "name": "Exif", - "asset_uuid": "554B190D-B064-479F-89CB-EB2485C3675F", - "_person_pk": 16, - "center_x": 0.5058241337537766, - "center_y": 0.40621668100357056, - "center": (1035, 811), - "mouth_x": 0.4940449122017374, - "mouth_y": 0.2800719558140182, - "mouth": (1011, 984), - "left_eye_x": 0.4374790271180322, - "left_eye_y": 0.5214642632262265, - "left_eye": (895, 654), - "right_eye_x": 0.5435461602085978, - "right_eye_y": 0.5581745216649008, - "right_eye": (1113, 603), - "size": 0.3930774775217287, - "face_rect": [ - (632.4886630177498, 408.4886630177498), - (1437.5113369822502, 1213.5113369822502), - ], - "mpri_reg_rect": { - "x": 0.3092853949929122, - "y": 0.29933464527130127, - "h": 0.3930774775217287, - "w": 0.5888973474502563, - }, - "mwg_rs_area": { - "x": 0.5058241337537766, - "y": 0.5937833189964294, - "h": 0.5888973474502563, - "w": 0.3930774775217287, - }, - "roll": 0.0, - "pitch": 0.0, - "yaw": 0.0, - "quality": 0.6076138019561768, - "source_width": 2048, - "source_height": 1367, + "source_height": 1348, "has_smile": 0, "left_eye_closed": 0, "right_eye_closed": 0, @@ -1683,49 +1741,111 @@ UUID_LIST_5 = [ } }, { - "2C766B95-1D8C-40DA-AD8E-39798BF4576D": { - "4A3085CA-9370-4401-920D-EE827BFB0385": { - "_pk": 14, - "uuid": "4A3085CA-9370-4401-920D-EE827BFB0385", - "name": "", - "asset_uuid": "2C766B95-1D8C-40DA-AD8E-39798BF4576D", - "_person_pk": 5, - "center_x": 0.5148479491472244, - "center_y": 0.37627631425857544, - "center": (1054, 851), - "mouth_x": 0.5168212004211425, - "mouth_y": 0.26665759770107655, - "mouth": (1058, 1001), - "left_eye_x": 0.43235626139945704, - "left_eye_y": 0.5063340759639829, - "left_eye": (885, 673), - "right_eye_x": 0.5781170603291468, - "right_eye_y": 0.504449233726675, - "right_eye": (1183, 676), - "size": 0.37983468174934387, + "80080A31-77A1-4984-8E51-E7466D9B9F34": { + "F86D4A0C-8261-48E2-98A2-F23EA9476204": { + "_pk": 22, + "uuid": "F86D4A0C-8261-48E2-98A2-F23EA9476204", + "name": "exif5", + "asset_uuid": "80080A31-77A1-4984-8E51-E7466D9B9F34", + "_person_pk": 24, + "center_x": 0.6222684847853996, + "center_y": 0.7361774780108254, + "center": (540, 849), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (2048, 0), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (2048, 0), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (2048, 0), + "size": 0.1869848668575287, "face_rect": [ - (665.0492858886719, 462.0492858886719), - (1442.9507141113281, 1239.9507141113281), + (348.5274963378906, 657.5274963378906), + (731.4725036621094, 1040.4725036621094), ], "mpri_reg_rect": { - "x": 0.3249306082725525, - "y": 0.33877810763788746, - "h": 0.37983468174934387, - "w": 0.5698911562070742, + "x": 0.1703300885604102, + "y": 0.48199558832964184, + "h": 0.1869848668575287, + "w": 0.28054579291151555, }, "mwg_rs_area": { - "x": 0.5148479491472244, - "y": 0.6237236857414246, - "h": 0.5698911562070742, - "w": 0.37983468174934387, + "x": 0.26382252198917455, + "y": 0.6222684847853996, + "h": 0.28054579291151555, + "w": 0.1869848668575287, }, "roll": 0.0, "pitch": 0.0, "yaw": 0.0, - "quality": 0.6023849248886108, - "source_width": 2048, - "source_height": 1365, - "has_smile": 1, + "quality": -1.0, + "source_width": 1365, + "source_height": 2048, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + } + } + }, + { + "E2930419-BEFD-4590-BC44-03E48466459D": { + "8729CB49-F829-401C-9D46-074D779A7F88": { + "_pk": 8, + "uuid": "8729CB49-F829-401C-9D46-074D779A7F88", + "name": "Makeup", + "asset_uuid": "E2930419-BEFD-4590-BC44-03E48466459D", + "_person_pk": 18, + "center_x": 0.6579082906246185, + "center_y": 0.4387013465166092, + "center": (710, 648), + "mouth_x": 0.7108257118094201, + "mouth_y": 0.3613844465998112, + "mouth": (803, 696), + "left_eye_x": 0.5002830154631764, + "left_eye_y": 0.46416851825610195, + "left_eye": (547, 707), + "right_eye_x": 0.6879877893428137, + "right_eye_y": 0.5751814254453071, + "right_eye": (659, 494), + "size": 0.47093212604522705, + "face_rect": [ + (438.0366972088814, 376.0366972088814), + (981.9633027911186, 919.9633027911186), + ], + "mpri_reg_rect": { + "x": 0.4060904176698791, + "y": 0.3258325904607773, + "h": 0.5036357459094789, + "w": 0.47093212604522705, + }, + "mwg_rs_area": { + "x": 0.6579082906246185, + "y": 0.5612986534833908, + "h": 0.47093212604522705, + "w": 0.5036357459094789, + }, + "roll": 0.5235987901687622, + "pitch": 0.0, + "yaw": 0.0, + "quality": 0.6832470893859863, + "source_width": 1080, + "source_height": 1155, + "has_smile": 0, "left_eye_closed": 0, "right_eye_closed": 0, "manual": 0, @@ -1737,13 +1857,199 @@ UUID_LIST_5 = [ "facial_hair_type": 1, "gender_type": 2, "glasses_type": 3, - "hair_color_type": 3, + "hair_color_type": 1, "intrash": 0, "lip_makeup_type": 0, "smile_type": 1, } } }, + { + "A2E762C9-F2A2-4806-9684-D1A78910B71E": { + "3B2DBD1A-1A6C-4278-8BA7-CCC786523159": { + "_pk": 18, + "uuid": "3B2DBD1A-1A6C-4278-8BA7-CCC786523159", + "name": "Statue", + "asset_uuid": "A2E762C9-F2A2-4806-9684-D1A78910B71E", + "_person_pk": 15, + "center_x": 0.4856320488721805, + "center_y": 0.8716400375939848, + "center": (1337, 353), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (0, 2754), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (0, 2754), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (0, 2754), + "size": 0.08544087409973145, + "face_rect": [ + (1219.3479163646698, 235.3479163646698), + (1454.6520836353302, 470.6520836353302), + ], + "mpri_reg_rect": { + "x": 0.44291161182231475, + "y": 0.08563952535614949, + "h": 0.08544087409973145, + "w": 0.08544087409973145, + }, + "mwg_rs_area": { + "x": 0.4856320488721805, + "y": 0.12835996240601522, + "h": 0.08544087409973145, + "w": 0.08544087409973145, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 2754, + "source_height": 2754, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + } + } + }, + { + "94D0440B-28BD-4724-89BD-A53662F57CC6": { + "03646A62-5D84-4425-BA83-0EE4EBA279C4": { + "_pk": 10, + "uuid": "03646A62-5D84-4425-BA83-0EE4EBA279C4", + "name": "Exif", + "asset_uuid": "94D0440B-28BD-4724-89BD-A53662F57CC6", + "_person_pk": 16, + "center_x": 0.5034043937921524, + "center_y": 0.40654684603214264, + "center": (1017, 555), + "mouth_x": 0.49383093682306267, + "mouth_y": 0.2808416709048345, + "mouth": (1036, 383), + "left_eye_x": 0.4368750899788476, + "left_eye_y": 0.5222734803531885, + "left_eye": (1153, 713), + "right_eye_x": 0.5449226343292468, + "right_eye_y": 0.5579434879607916, + "right_eye": (931, 762), + "size": 0.39579104888252914, + "face_rect": [ + (611.7099659442902, 149.70996594429016), + (1422.2900340557098, 960.2900340557098), + ], + "mpri_reg_rect": { + "x": 0.298700081766583, + "y": 0.11006547510623932, + "h": 0.39579104888252914, + "w": 0.5929627418518066, + }, + "mwg_rs_area": { + "x": 0.4965956062078476, + "y": 0.40654684603214264, + "h": 0.5929627418518066, + "w": 0.39579104888252914, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": 0.6154575347900391, + "source_width": 2048, + "source_height": 1367, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 0, + "face_type": None, + "age_type": 3, + "bald_type": 3, + "eye_makeup_type": 0, + "eye_state": 2, + "facial_hair_type": 1, + "gender_type": 2, + "glasses_type": 3, + "hair_color_type": 1, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 2, + } + } + }, + { + "77BD401F-4308-47A5-BA28-3369FAAFEBE2": { + "C4856268-8917-4DDD-AD8B-5894F4858CD0": { + "_pk": 23, + "uuid": "C4856268-8917-4DDD-AD8B-5894F4858CD0", + "name": "exif4", + "asset_uuid": "77BD401F-4308-47A5-BA28-3369FAAFEBE2", + "_person_pk": 25, + "center_x": 0.6141950066171988, + "center_y": 0.7367272073748309, + "center": (838, 1508), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (0, 0), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (0, 0), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (0, 0), + "size": 0.18636979162693024, + "face_rect": [ + (647.1573333740234, 1317.1573333740234), + (1028.8426666259766, 1698.8426666259766), + ], + "mpri_reg_rect": { + "x": 0.47438352923553107, + "y": 0.6435423115613658, + "h": 0.2796229547633356, + "w": 0.18636979162693024, + }, + "mwg_rs_area": { + "x": 0.6141950066171988, + "y": 0.7367272073748309, + "h": 0.18636979162693024, + "w": 0.2796229547633356, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 1365, + "source_height": 2048, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + } + } + }, { "26011634-7F89-47DD-AA3B-A3693708E3F9": { "A556C3BC-B7C5-42A4-95BB-C3EF8B016FF7": { @@ -1807,129 +2113,551 @@ UUID_LIST_5 = [ } }, { - "D615DA33-90CD-4F69-A216-496F3D983539": { - "901900AD-DBA2-433F-B7B1-CA151C7128BC": { - "_pk": 15, - "uuid": "901900AD-DBA2-433F-B7B1-CA151C7128BC", - "name": "", - "asset_uuid": "D615DA33-90CD-4F69-A216-496F3D983539", - "_person_pk": 13, - "center_x": 0.41722412779927254, - "center_y": 0.6922222226858139, - "center": (406, 200), - "mouth_x": 0.42577595307495686, - "mouth_y": 0.6447541338080145, - "mouth": (415, 230), - "left_eye_x": 0.38865975022355026, - "left_eye_y": 0.7286542254184032, - "left_eye": (378, 176), - "right_eye_x": 0.4346261919298051, - "right_eye_y": 0.741291684812657, - "right_eye": (423, 168), - "size": 0.12307403484980266, + "79096F62-C8E9-4652-85A0-D77C972FDFDF": { + "61AE5DBA-DE4F-44A3-BF47-4CF34846C0C6": { + "_pk": 37, + "uuid": "61AE5DBA-DE4F-44A3-BF47-4CF34846C0C6", + "name": "left4", + "asset_uuid": "79096F62-C8E9-4652-85A0-D77C972FDFDF", + "_person_pk": 40, + "center_x": 0.3106900838533541, + "center_y": 0.6720543107438582, + "center": (636, 917), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (0, 0), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (0, 0), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (0, 0), + "size": 0.11487732082605362, "face_rect": [ - (346.0014080107212, 140.0014080107212), - (465.9985919892788, 259.9985919892788), + (518.3656234741211, 799.3656234741211), + (753.6343765258789, 1034.634376525879), ], "mpri_reg_rect": { - "x": 0.35568711037437123, - "y": 0.2154722511768341, - "h": 0.12307403484980266, - "w": 0.18461105227470398, + "x": 0.2532514234403273, + "y": 0.5858752803219689, + "h": 0.11487732082605362, + "w": 0.1723580608437786, }, "mwg_rs_area": { - "x": 0.41722412779927254, - "y": 0.3077777773141861, - "h": 0.18461105227470398, - "w": 0.12307403484980266, + "x": 0.3106900838533541, + "y": 0.6720543107438582, + "h": 0.1723580608437786, + "w": 0.11487732082605362, }, "roll": 0.0, "pitch": 0.0, "yaw": 0.0, - "quality": 0.45529818534851074, - "source_width": 975, - "source_height": 650, + "quality": -1.0, + "source_width": 2048, + "source_height": 1365, "has_smile": 0, "left_eye_closed": 0, "right_eye_closed": 0, - "manual": 0, + "manual": 1, "face_type": None, - "age_type": 5, - "bald_type": 3, + "age_type": 0, + "bald_type": 0, "eye_makeup_type": 0, - "eye_state": 2, - "facial_hair_type": 3, - "gender_type": 1, - "glasses_type": 3, - "hair_color_type": 1, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, "intrash": 0, "lip_makeup_type": 0, - "smile_type": 1, - } + "smile_type": 0, + }, + "1B9F9019-D6BF-4892-BBCA-C4DED32FDA64": { + "_pk": 38, + "uuid": "1B9F9019-D6BF-4892-BBCA-C4DED32FDA64", + "name": "right4", + "asset_uuid": "79096F62-C8E9-4652-85A0-D77C972FDFDF", + "_person_pk": 41, + "center_x": 0.7148559379875195, + "center_y": 0.5797809055219351, + "center": (1464, 791), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (0, 0), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (0, 0), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (0, 0), + "size": 0.08438519388437271, + "face_rect": [ + (1377.5895614624023, 704.5895614624023), + (1550.4104385375977, 877.4104385375977), + ], + "mpri_reg_rect": { + "x": 0.6726633410453331, + "y": 0.5164765549449405, + "h": 0.08438519388437271, + "w": 0.12660870115398923, + }, + "mwg_rs_area": { + "x": 0.7148559379875195, + "y": 0.5797809055219351, + "h": 0.12660870115398923, + "w": 0.08438519388437271, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 2048, + "source_height": 1365, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + }, } }, { - "41581532-858D-4767-ADA8-9D26C52FCB96": { - "2DBD01FF-EC8F-4757-8F9E-D5F6AB6EC963": { - "_pk": 5, - "uuid": "2DBD01FF-EC8F-4757-8F9E-D5F6AB6EC963", - "name": "Exif", - "asset_uuid": "41581532-858D-4767-ADA8-9D26C52FCB96", - "_person_pk": 16, - "center_x": 0.506168320775032, - "center_y": 0.4063185453414917, - "center": (555, 1036), - "mouth_x": 0.49372094131355543, - "mouth_y": 0.28159753170711355, - "mouth": (384, 1011), - "left_eye_x": 0.43724246548613566, - "left_eye_y": 0.5224152194593512, - "left_eye": (714, 895), - "right_eye_x": 0.544619582741027, - "right_eye_y": 0.557959678001068, - "right_eye": (762, 1115), - "size": 0.3950786292552948, + "9E7D89FF-05C0-415E-BA48-1B3AE8A8A910": { + "DCE806B8-39A9-454A-8FA3-BAD40D9B0A66": { + "_pk": 6, + "uuid": "DCE806B8-39A9-454A-8FA3-BAD40D9B0A66", + "name": "Girl Winking", + "asset_uuid": "9E7D89FF-05C0-415E-BA48-1B3AE8A8A910", + "_person_pk": 21, + "center_x": 0.7959673330187798, + "center_y": 0.5137898772954941, + "center": (1630, 663), + "mouth_x": 0.8051418400925123, + "mouth_y": 0.45098027932299384, + "mouth": (1648, 749), + "left_eye_x": 0.755372609972766, + "left_eye_y": 0.6016391057377022, + "left_eye": (1547, 543), + "right_eye_x": 0.8485378818859849, + "right_eye_y": 0.5883882606575139, + "right_eye": (1737, 561), + "size": 0.22552989423274994, "face_rect": [ - (150.43948364257812, 631.4394836425781), - (959.5605163574219, 1440.5605163574219), + (1399.057388305664, 432.05738830566406), + (1860.942611694336, 893.9426116943359), ], "mpri_reg_rect": { - "x": 0.1103708376915854, - "y": 0.30862900614738464, - "h": 0.5918954152998126, - "w": 0.3950786292552948, + "x": 0.6832023859024048, + "y": 0.3170213961885089, + "h": 0.22552989423274994, + "w": 0.33837745303199407, }, "mwg_rs_area": { - "x": 0.4063185453414917, - "y": 0.506168320775032, - "h": 0.3950786292552948, - "w": 0.5918954152998126, + "x": 0.7959673330187798, + "y": 0.4862101227045059, + "h": 0.33837745303199407, + "w": 0.22552989423274994, }, "roll": 0.0, "pitch": 0.0, "yaw": 0.0, - "quality": 0.6100583076477051, + "quality": 0.40995678305625916, "source_width": 2048, - "source_height": 1367, + "source_height": 1365, "has_smile": 0, "left_eye_closed": 0, "right_eye_closed": 0, "manual": 0, "face_type": None, - "age_type": 3, + "age_type": 2, "bald_type": 3, "eye_makeup_type": 0, "eye_state": 2, "facial_hair_type": 1, - "gender_type": 2, + "gender_type": 1, "glasses_type": 3, - "hair_color_type": 1, + "hair_color_type": 3, "intrash": 0, "lip_makeup_type": 0, "smile_type": 2, } } }, + { + "21EF6CF1-7BA6-43CB-A6B8-597CA9C52E76": { + "91408749-20D9-4202-8A88-B22E596256CA": { + "_pk": 25, + "uuid": "91408749-20D9-4202-8A88-B22E596256CA", + "name": "exif2", + "asset_uuid": "21EF6CF1-7BA6-43CB-A6B8-597CA9C52E76", + "_person_pk": 27, + "center_x": 0.6049943741418708, + "center_y": 0.7312299137347767, + "center": (539, 550), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (1365, 2048), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (1365, 2048), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (1365, 2048), + "size": 0.1636117547750473, + "face_rect": [ + (371.46156311035156, 382.46156311035156), + (706.5384368896484, 717.5384368896484), + ], + "mpri_reg_rect": { + "x": 0.2722668442539911, + "y": 0.1869642088776996, + "h": 0.2454775632082761, + "w": 0.1636117547750473, + }, + "mwg_rs_area": { + "x": 0.39500562585812915, + "y": 0.26877008626522325, + "h": 0.1636117547750473, + "w": 0.2454775632082761, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 1365, + "source_height": 2048, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + } + } + }, + { + "C3BE45BB-F9E8-46C2-88FF-EB6A8E445A31": { + "EA76107F-FA57-41DD-A0C6-E5B0E2B8CBCC": { + "_pk": 29, + "uuid": "EA76107F-FA57-41DD-A0C6-E5B0E2B8CBCC", + "name": "left0", + "asset_uuid": "C3BE45BB-F9E8-46C2-88FF-EB6A8E445A31", + "_person_pk": 31, + "center_x": 0.3147730596723869, + "center_y": 0.6831690410473562, + "center": (644, 432), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (0, 1365), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (0, 1365), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (0, 1365), + "size": 0.11274996399879456, + "face_rect": [ + (528.5440368652344, 316.5440368652344), + (759.4559631347656, 547.4559631347656), + ], + "mpri_reg_rect": { + "x": 0.2583980776729896, + "y": 0.23224783577699132, + "h": 0.11274996399879456, + "w": 0.16916624635130495, + }, + "mwg_rs_area": { + "x": 0.3147730596723869, + "y": 0.3168309589526438, + "h": 0.16916624635130495, + "w": 0.11274996399879456, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 2048, + "source_height": 1365, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + }, + "D391058C-2780-4B94-95AE-C58DECB35477": { + "_pk": 30, + "uuid": "D391058C-2780-4B94-95AE-C58DECB35477", + "name": "right0", + "asset_uuid": "C3BE45BB-F9E8-46C2-88FF-EB6A8E445A31", + "_person_pk": 32, + "center_x": 0.7304504680187207, + "center_y": 0.5982010708999789, + "center": (1495, 548), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (0, 1365), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (0, 1365), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (0, 1365), + "size": 0.11274996399879456, + "face_rect": [ + (1379.5440368652344, 432.5440368652344), + (1610.4559631347656, 663.4559631347656), + ], + "mpri_reg_rect": { + "x": 0.6740754860193234, + "y": 0.31721580592436865, + "h": 0.11274996399879456, + "w": 0.16916624635130495, + }, + "mwg_rs_area": { + "x": 0.7304504680187207, + "y": 0.40179892910002113, + "h": 0.16916624635130495, + "w": 0.11274996399879456, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 2048, + "source_height": 1365, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + }, + } + }, + { + "B0757DA2-0D67-4991-980E-E935C4790827": { + "D94A34C4-9F78-44B8-9730-8D72E6625CCD": { + "_pk": 24, + "uuid": "D94A34C4-9F78-44B8-9730-8D72E6625CCD", + "name": "exif3", + "asset_uuid": "B0757DA2-0D67-4991-980E-E935C4790827", + "_person_pk": 26, + "center_x": 0.6091659355529451, + "center_y": 0.7419337787550745, + "center": (533, 1519), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (1365, 0), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (1365, 0), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (1365, 0), + "size": 0.18944519758224487, + "face_rect": [ + (339.00811767578125, 1325.0081176757812), + (726.9918823242188, 1712.9918823242188), + ], + "mpri_reg_rect": { + "x": 0.24871546933773717, + "y": 0.647211179963952, + "h": 0.2842371902186355, + "w": 0.18944519758224487, + }, + "mwg_rs_area": { + "x": 0.39083406444705493, + "y": 0.7419337787550745, + "h": 0.18944519758224487, + "w": 0.2842371902186355, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 1365, + "source_height": 2048, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + } + } + }, + { + "75DCDF37-A924-4280-BEC7-A5EC6EFE6016": { + "73BDD408-7465-46D7-9B10-53486E235059": { + "_pk": 31, + "uuid": "73BDD408-7465-46D7-9B10-53486E235059", + "name": "left1", + "asset_uuid": "75DCDF37-A924-4280-BEC7-A5EC6EFE6016", + "_person_pk": 33, + "center_x": 0.3119149765990639, + "center_y": 0.6578240272468041, + "center": (638, 467), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (0, 1365), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (0, 1365), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (0, 1365), + "size": 0.0872216671705246, + "face_rect": [ + (548.6850128173828, 377.6850128173828), + (727.3149871826172, 556.3149871826172), + ], + "mpri_reg_rect": { + "x": 0.2683041430138016, + "y": 0.2767437477109855, + "h": 0.0872216671705246, + "w": 0.1308644500844208, + }, + "mwg_rs_area": { + "x": 0.3119149765990639, + "y": 0.3421759727531959, + "h": 0.1308644500844208, + "w": 0.0872216671705246, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 2048, + "source_height": 1365, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + }, + "8D9E2AC9-43C8-44C1-B0E9-FAF39B4464B1": { + "_pk": 32, + "uuid": "8D9E2AC9-43C8-44C1-B0E9-FAF39B4464B1", + "name": "right1", + "asset_uuid": "75DCDF37-A924-4280-BEC7-A5EC6EFE6016", + "_person_pk": 35, + "center_x": 0.7187439060062402, + "center_y": 0.5911242163972272, + "center": (1471, 558), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (0, 1365), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (0, 1365), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (0, 1365), + "size": 0.09998581558465958, + "face_rect": [ + (1368.6145248413086, 455.6145248413086), + (1573.3854751586914, 660.3854751586914), + ], + "mpri_reg_rect": { + "x": 0.6687509982139104, + "y": 0.3338681094938413, + "h": 0.09998581558465958, + "w": 0.15001534821786286, + }, + "mwg_rs_area": { + "x": 0.7187439060062402, + "y": 0.40887578360277277, + "h": 0.15001534821786286, + "w": 0.09998581558465958, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 2048, + "source_height": 1365, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + }, + } + }, { "C36C837E-338D-40D5-B151-0AE3171DEF52": { "913589EA-415D-4EEC-B11D-701E94F380F2": { @@ -1993,110 +2721,48 @@ UUID_LIST_5 = [ } }, { - "82B6F7FA-C552-4A91-9150-372EF3437FDC": { - "5384E868-2CC2-4D2F-B171-46193567073E": { - "_pk": 9, - "uuid": "5384E868-2CC2-4D2F-B171-46193567073E", - "name": "Bald Guy with Beard and Glasses", - "asset_uuid": "82B6F7FA-C552-4A91-9150-372EF3437FDC", - "_person_pk": 17, - "center_x": 0.32925228029489517, - "center_y": 0.5016408860683441, - "center": (674, 680), - "mouth_x": 0.35357513787707784, - "mouth_y": 0.4528046849535592, - "mouth": (750, 712), - "left_eye_x": 0.2717253644791406, - "left_eye_y": 0.5492886026650554, - "left_eye": (539, 682), - "right_eye_x": 0.3415018531310906, - "right_eye_y": 0.578722708157068, - "right_eye": (643, 576), - "size": 0.2136638136289548, + "5E461935-2FE5-4762-80D3-FCF70739FFA0": { + "878F66D3-0E53-47C7-BE17-BAC1212EEF47": { + "_pk": 7, + "uuid": "878F66D3-0E53-47C7-BE17-BAC1212EEF47", + "name": "Exif", + "asset_uuid": "5E461935-2FE5-4762-80D3-FCF70739FFA0", + "_person_pk": 16, + "center_x": 0.5060971826314926, + "center_y": 0.4065530300140381, + "center": (811, 1011), + "mouth_x": 0.4947084969874238, + "mouth_y": 0.28146992416738925, + "mouth": (982, 1034), + "left_eye_x": 0.4379364977447421, + "left_eye_y": 0.5229665160904489, + "left_eye": (652, 1151), + "right_eye_x": 0.5447459726413946, + "right_eye_y": 0.5572845329942382, + "right_eye": (605, 932), + "size": 0.3970904248999432, "face_rect": [ - (455.2082548439503, 461.2082548439503), - (892.7917451560497, 898.7917451560497), + (404.3794049024582, 604.3794049024582), + (1217.6205950975418, 1417.6205950975418), ], "mpri_reg_rect": { - "x": 0.22242037348041777, - "y": 0.33807212114334106, - "h": 0.2136638136289548, - "w": 0.32057398557662964, + "x": 0.29599225521087646, + "y": 0.2953576049185358, + "h": 0.5949094295501709, + "w": 0.3970904248999432, }, "mwg_rs_area": { - "x": 0.32925228029489517, - "y": 0.4983591139316559, - "h": 0.32057398557662964, - "w": 0.2136638136289548, + "x": 0.5934469699859619, + "y": 0.4939028173685074, + "h": 0.3970904248999432, + "w": 0.5949094295501709, }, - "roll": 0.5235987901687622, + "roll": 0.0, "pitch": 0.0, "yaw": 0.0, - "quality": 0.5326955318450928, + "quality": 0.6108523607254028, "source_width": 2048, - "source_height": 1365, - "has_smile": 0, - "left_eye_closed": 0, - "right_eye_closed": 0, - "manual": 0, - "face_type": None, - "age_type": 5, - "bald_type": 2, - "eye_makeup_type": 0, - "eye_state": 2, - "facial_hair_type": 2, - "gender_type": 1, - "glasses_type": 1, - "hair_color_type": 3, - "intrash": 0, - "lip_makeup_type": 0, - "smile_type": 1, - } - } - }, - { - "E2930419-BEFD-4590-BC44-03E48466459D": { - "8729CB49-F829-401C-9D46-074D779A7F88": { - "_pk": 8, - "uuid": "8729CB49-F829-401C-9D46-074D779A7F88", - "name": "Makeup", - "asset_uuid": "E2930419-BEFD-4590-BC44-03E48466459D", - "_person_pk": 18, - "center_x": 0.6579082906246185, - "center_y": 0.4387013465166092, - "center": (710, 648), - "mouth_x": 0.7108257118094201, - "mouth_y": 0.3613844465998112, - "mouth": (803, 696), - "left_eye_x": 0.5002830154631764, - "left_eye_y": 0.46416851825610195, - "left_eye": (547, 707), - "right_eye_x": 0.6879877893428137, - "right_eye_y": 0.5751814254453071, - "right_eye": (659, 494), - "size": 0.47093212604522705, - "face_rect": [ - (438.0366972088814, 376.0366972088814), - (981.9633027911186, 919.9633027911186), - ], - "mpri_reg_rect": { - "x": 0.4060904176698791, - "y": 0.3258325904607773, - "h": 0.5036357459094789, - "w": 0.47093212604522705, - }, - "mwg_rs_area": { - "x": 0.6579082906246185, - "y": 0.5612986534833908, - "h": 0.47093212604522705, - "w": 0.5036357459094789, - }, - "roll": 0.5235987901687622, - "pitch": 0.0, - "yaw": 0.0, - "quality": 0.6832470893859863, - "source_width": 1080, - "source_height": 1155, + "source_height": 1367, "has_smile": 0, "left_eye_closed": 0, "right_eye_closed": 0, @@ -2112,10 +2778,1106 @@ UUID_LIST_5 = [ "hair_color_type": 1, "intrash": 0, "lip_makeup_type": 0, + "smile_type": 2, + } + } + }, + { + "11639AAB-F5C3-46F8-9058-9C19AD726D00": { + "B4308009-CC51-4ED1-8A93-6F443BC21A27": { + "_pk": 19, + "uuid": "B4308009-CC51-4ED1-8A93-6F443BC21A27", + "name": "exif7", + "asset_uuid": "11639AAB-F5C3-46F8-9058-9C19AD726D00", + "_person_pk": 22, + "center_x": 0.605224365170238, + "center_y": 0.7358444688768608, + "center": (1507, 538), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (0, 1365), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (0, 1365), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (0, 1365), + "size": 0.17468322813510895, + "face_rect": [ + (1328.1243743896484, 359.12437438964844), + (1685.8756256103516, 716.8756256103516), + ], + "mpri_reg_rect": { + "x": 0.6485028548093064, + "y": 0.2637312204632041, + "h": 0.17468322813510895, + "w": 0.26208882873311584, + }, + "mwg_rs_area": { + "x": 0.7358444688768608, + "y": 0.39477563482976197, + "h": 0.26208882873311584, + "w": 0.17468322813510895, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 1365, + "source_height": 2048, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + } + } + }, + { + "B507D754-0C5D-4CDF-BAE4-2257292CA28A": { + "1524B3BF-21A4-476F-930E-87445AE6AB02": { + "_pk": 39, + "uuid": "1524B3BF-21A4-476F-930E-87445AE6AB02", + "name": "left5", + "asset_uuid": "B507D754-0C5D-4CDF-BAE4-2257292CA28A", + "_person_pk": 42, + "center_x": 0.3117260627925117, + "center_y": 0.6753607287148629, + "center": (443, 638), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (1365, 0), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (1365, 0), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (1365, 0), + "size": 0.10140405595302582, + "face_rect": [ + (339.16224670410156, 534.1622467041016), + (546.8377532958984, 741.8377532958984), + ], + "mpri_reg_rect": { + "x": 0.2485676571489478, + "y": 0.2610240348159988, + "h": 0.15214322827237867, + "w": 0.10140405595302582, + }, + "mwg_rs_area": { + "x": 0.32463927128513714, + "y": 0.3117260627925117, + "h": 0.10140405595302582, + "w": 0.15214322827237867, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 2048, + "source_height": 1365, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + }, + "F2F5CAAD-934C-4FF2-9393-119F9DDAF42F": { + "_pk": 40, + "uuid": "F2F5CAAD-934C-4FF2-9393-119F9DDAF42F", + "name": "right5", + "asset_uuid": "B507D754-0C5D-4CDF-BAE4-2257292CA28A", + "_person_pk": 43, + "center_x": 0.7180004387675506, + "center_y": 0.581871274850994, + "center": (570, 1470), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (1365, 0), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (1365, 0), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (1365, 0), + "size": 0.08793079107999802, + "face_rect": [ + (479.95886993408203, 1379.958869934082), + (660.041130065918, 1560.041130065918), + ], + "mpri_reg_rect": { + "x": 0.35216452729851666, + "y": 0.6740350432275516, + "h": 0.1319283957009787, + "w": 0.08793079107999802, + }, + "mwg_rs_area": { + "x": 0.418128725149006, + "y": 0.7180004387675506, + "h": 0.08793079107999802, + "w": 0.1319283957009787, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 2048, + "source_height": 1365, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + }, + } + }, + { + "3609084A-8A63-429D-A122-41F147F6D1BB": { + "0164751A-5827-43D8-ACE1-E901694A46B2": { + "_pk": 27, + "uuid": "0164751A-5827-43D8-ACE1-E901694A46B2", + "name": "exif0", + "asset_uuid": "3609084A-8A63-429D-A122-41F147F6D1BB", + "_person_pk": 29, + "center_x": 0.6116175209544628, + "center_y": 0.7398564360622464, + "center": (834, 532), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (0, 2048), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (0, 2048), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (0, 2048), + "size": 0.17837372422218323, + "face_rect": [ + (651.3453063964844, 349.3453063964844), + (1016.6546936035156, 714.6546936035156), + ], + "mpri_reg_rect": { + "x": 0.4778045586075649, + "y": 0.170956701826662, + "h": 0.2676259246937958, + "w": 0.17837372422218323, + }, + "mwg_rs_area": { + "x": 0.6116175209544628, + "y": 0.2601435639377536, + "h": 0.17837372422218323, + "w": 0.2676259246937958, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 1365, + "source_height": 2048, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + } + } + }, + { + "A478D042-FA26-4863-8E6F-EE749F4710E5": { + "072894ED-0B0F-4711-8D7B-F6F4991C8E53": { + "_pk": 41, + "uuid": "072894ED-0B0F-4711-8D7B-F6F4991C8E53", + "name": "left6", + "asset_uuid": "A478D042-FA26-4863-8E6F-EE749F4710E5", + "_person_pk": 44, + "center_x": 0.31069617784711384, + "center_y": 0.6640231323538656, + "center": (458, 1411), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (1365, 2048), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (1365, 2048), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (1365, 2048), + "size": 0.09856758266687393, + "face_rect": [ + (357.0667953491211, 1310.066795349121), + (558.9332046508789, 1511.933204650879), + ], + "mpri_reg_rect": { + "x": 0.2620331279751609, + "y": 0.6400200308194492, + "h": 0.14788747934194713, + "w": 0.09856758266687393, + }, + "mwg_rs_area": { + "x": 0.33597686764613444, + "y": 0.6893038221528862, + "h": 0.09856758266687393, + "w": 0.14788747934194713, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 2048, + "source_height": 1365, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + }, + "AAE996DF-2BAF-4945-A6F2-442DA1986F69": { + "_pk": 42, + "uuid": "AAE996DF-2BAF-4945-A6F2-442DA1986F69", + "name": "right6", + "asset_uuid": "A478D042-FA26-4863-8E6F-EE749F4710E5", + "_person_pk": 45, + "center_x": 0.7150996977379095, + "center_y": 0.5716582949032247, + "center": (584, 583), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (1365, 2048), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (1365, 2048), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (1365, 2048), + "size": 0.09360374510288239, + "face_rect": [ + (488.14976501464844, 487.14976501464844), + (679.8502349853516, 678.8502349853516), + ], + "mpri_reg_rect": { + "x": 0.35812175272655433, + "y": 0.23809842971064932, + "h": 0.14043990474044185, + "w": 0.09360374510288239, + }, + "mwg_rs_area": { + "x": 0.42834170509677527, + "y": 0.2849003022620905, + "h": 0.09360374510288239, + "w": 0.14043990474044185, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 2048, + "source_height": 1365, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + }, + } + }, + { + "4736ED4D-B3DC-46EB-93F0-6481674753B1": { + "B1D0CBD2-4B16-487F-8555-6EEA65EEE257": { + "_pk": 20, + "uuid": "B1D0CBD2-4B16-487F-8555-6EEA65EEE257", + "name": "exif6", + "asset_uuid": "4736ED4D-B3DC-46EB-93F0-6481674753B1", + "_person_pk": 23, + "center_x": 0.6203482579666613, + "center_y": 0.7382918217185386, + "center": (535, 518), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (2048, 1365), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (2048, 1365), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (2048, 1365), + "size": 0.17714355885982513, + "face_rect": [ + (353.60499572753906, 336.60499572753906), + (716.3950042724609, 699.3950042724609), + ], + "mpri_reg_rect": { + "x": 0.17313639885154886, + "y": 0.24676162901322082, + "h": 0.17714355885982513, + "w": 0.2657802260402358, + }, + "mwg_rs_area": { + "x": 0.2617081782814614, + "y": 0.37965174203333873, + "h": 0.2657802260402358, + "w": 0.17714355885982513, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 1365, + "source_height": 2048, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + } + } + }, + { + "4BE91165-2DA2-438C-A768-C332BB3827B1": { + "D2A1A019-9CAA-4D41-89C0-7B03E7EC12E3": { + "_pk": 43, + "uuid": "D2A1A019-9CAA-4D41-89C0-7B03E7EC12E3", + "name": "left7", + "asset_uuid": "4BE91165-2DA2-438C-A768-C332BB3827B1", + "_person_pk": 46, + "center_x": 0.31374317472698904, + "center_y": 0.6682598732520728, + "center": (912, 1405), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (0, 2048), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (0, 2048), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (0, 2048), + "size": 0.11700467765331268, + "face_rect": [ + (792.1872100830078, 1285.1872100830078), + (1031.8127899169922, 1524.8127899169922), + ], + "mpri_reg_rect": { + "x": 0.5804849355839466, + "y": 0.6277544864463547, + "h": 0.1755498753362523, + "w": 0.11700467765331268, + }, + "mwg_rs_area": { + "x": 0.6682598732520728, + "y": 0.686256825273011, + "h": 0.11700467765331268, + "w": 0.1755498753362523, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 2048, + "source_height": 1365, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + }, + "881A2FBC-0B54-4946-9AE5-EA872DDA7B3A": { + "_pk": 44, + "uuid": "881A2FBC-0B54-4946-9AE5-EA872DDA7B3A", + "name": "right7", + "asset_uuid": "4BE91165-2DA2-438C-A768-C332BB3827B1", + "_person_pk": 47, + "center_x": 0.7053858716848673, + "center_y": 0.5853674146965878, + "center": (799, 603), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (0, 2048), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (0, 2048), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (0, 2048), + "size": 0.08863990753889084, + "face_rect": [ + (708.2327346801758, 512.2327346801758), + (889.7672653198242, 693.7672653198242), + ], + "mpri_reg_rect": { + "x": 0.5188712496271195, + "y": 0.25029417454568725, + "h": 0.13299233013893658, + "w": 0.08863990753889084, + }, + "mwg_rs_area": { + "x": 0.5853674146965878, + "y": 0.2946141283151327, + "h": 0.08863990753889084, + "w": 0.13299233013893658, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 2048, + "source_height": 1365, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + }, + } + }, + { + "399592DC-B764-4489-929A-4CD820E374C1": { + "5693923B-449A-4B8D-8E32-20748FB67E46": { + "_pk": 35, + "uuid": "5693923B-449A-4B8D-8E32-20748FB67E46", + "name": "left3", + "asset_uuid": "399592DC-B764-4489-929A-4CD820E374C1", + "_person_pk": 38, + "center_x": 0.31382849063962553, + "center_y": 0.669613070237095, + "center": (1405, 914), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (2048, 0), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (2048, 0), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (2048, 0), + "size": 0.09218550473451614, + "face_rect": [ + (1310.6020431518555, 819.6020431518555), + (1499.3979568481445, 1008.3979568481445), + ], + "mpri_reg_rect": { + "x": 0.6400787569931163, + "y": 0.6004570578941321, + "h": 0.09218550473451614, + "w": 0.13831202468592604, + }, + "mwg_rs_area": { + "x": 0.6861715093603744, + "y": 0.669613070237095, + "h": 0.13831202468592604, + "w": 0.09218550473451614, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 2048, + "source_height": 1365, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + }, + "E2D82CB4-E3FD-4C91-B74E-AB52D35C3E3E": { + "_pk": 36, + "uuid": "E2D82CB4-E3FD-4C91-B74E-AB52D35C3E3E", + "name": "right3", + "asset_uuid": "399592DC-B764-4489-929A-4CD820E374C1", + "_person_pk": 39, + "center_x": 0.7172265015600623, + "center_y": 0.582149000245724, + "center": (579, 794), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (2048, 0), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (2048, 0), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (2048, 0), + "size": 0.09927669912576675, + "face_rect": [ + (477.34066009521484, 692.3406600952148), + (680.6593399047852, 895.6593399047852), + ], + "mpri_reg_rect": { + "x": 0.23313514887705433, + "y": 0.5076732933557715, + "h": 0.09927669912576675, + "w": 0.14895141377990498, + }, + "mwg_rs_area": { + "x": 0.2827734984399377, + "y": 0.582149000245724, + "h": 0.14895141377990498, + "w": 0.09927669912576675, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 2048, + "source_height": 1365, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + }, + } + }, + { + "74A8D2AD-4A95-402C-AB41-8948B6268DDE": { + "3564F47E-BE04-4EF2-9409-7F0AFC3C6C90": { + "_pk": 12, + "uuid": "3564F47E-BE04-4EF2-9409-7F0AFC3C6C90", + "name": "", + "asset_uuid": "74A8D2AD-4A95-402C-AB41-8948B6268DDE", + "_person_pk": 9, + "center_x": 0.4150405116379261, + "center_y": 0.3804657310247421, + "center": (498, 991), + "mouth_x": 0.35514891692551487, + "mouth_y": 0.28526406607189375, + "mouth": (426, 1143), + "left_eye_x": 0.24532392920940715, + "left_eye_y": 0.5437179133602399, + "left_eye": (294, 730), + "right_eye_x": 0.5664884610123178, + "right_eye_y": 0.5198140024518239, + "right_eye": (679, 768), + "size": 0.5623092949390411, + "face_rect": [ + (48.15256404876709, 541.1525640487671), + (947.8474359512329, 1440.847435951233), + ], + "mpri_reg_rect": { + "x": 0.04016764834523201, + "y": 0.3383796215057373, + "h": 0.7497457265853882, + "w": 0.5623092949390411, + }, + "mwg_rs_area": { + "x": 0.4150405116379261, + "y": 0.6195342689752579, + "h": 0.5623092949390411, + "w": 0.7497457265853882, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": 0.5376036167144775, + "source_width": 1200, + "source_height": 1600, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 0, + "face_type": None, + "age_type": 3, + "bald_type": 3, + "eye_makeup_type": 0, + "eye_state": 2, + "facial_hair_type": 1, + "gender_type": 1, + "glasses_type": 3, + "hair_color_type": 5, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 2, + } + } + }, + { + "D615DA33-90CD-4F69-A216-496F3D983539": { + "901900AD-DBA2-433F-B7B1-CA151C7128BC": { + "_pk": 15, + "uuid": "901900AD-DBA2-433F-B7B1-CA151C7128BC", + "name": "", + "asset_uuid": "D615DA33-90CD-4F69-A216-496F3D983539", + "_person_pk": 13, + "center_x": 0.41722412779927254, + "center_y": 0.6922222226858139, + "center": (406, 200), + "mouth_x": 0.42577595307495686, + "mouth_y": 0.6447541338080145, + "mouth": (415, 230), + "left_eye_x": 0.38865975022355026, + "left_eye_y": 0.7286542254184032, + "left_eye": (378, 176), + "right_eye_x": 0.4346261919298051, + "right_eye_y": 0.741291684812657, + "right_eye": (423, 168), + "size": 0.12307403484980266, + "face_rect": [ + (346.0014080107212, 140.0014080107212), + (465.9985919892788, 259.9985919892788), + ], + "mpri_reg_rect": { + "x": 0.35568711037437123, + "y": 0.2154722511768341, + "h": 0.12307403484980266, + "w": 0.18461105227470398, + }, + "mwg_rs_area": { + "x": 0.41722412779927254, + "y": 0.3077777773141861, + "h": 0.18461105227470398, + "w": 0.12307403484980266, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": 0.45529818534851074, + "source_width": 975, + "source_height": 650, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 0, + "face_type": None, + "age_type": 5, + "bald_type": 3, + "eye_makeup_type": 0, + "eye_state": 2, + "facial_hair_type": 3, + "gender_type": 1, + "glasses_type": 3, + "hair_color_type": 1, + "intrash": 0, + "lip_makeup_type": 0, "smile_type": 1, } } }, + { + "C547648F-B778-43B5-B12B-4338B7377D09": { + "81D77670-997D-4EFB-97DF-1CD355C00824": { + "_pk": 33, + "uuid": "81D77670-997D-4EFB-97DF-1CD355C00824", + "name": "left2", + "asset_uuid": "C547648F-B778-43B5-B12B-4338B7377D09", + "_person_pk": 36, + "center_x": 0.3128778276131045, + "center_y": 0.6626699353688433, + "center": (1407, 460), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (2048, 1365), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (2048, 1365), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (2048, 1365), + "size": 0.07942135632038116, + "face_rect": [ + (1325.6725311279297, 378.6725311279297), + (1488.3274688720703, 541.3274688720703), + ], + "mpri_reg_rect": { + "x": 0.6474114942267049, + "y": 0.27774950135491466, + "h": 0.07942135632038116, + "w": 0.11916112655248397, + }, + "mwg_rs_area": { + "x": 0.6871221723868954, + "y": 0.33733006463115667, + "h": 0.11916112655248397, + "w": 0.07942135632038116, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 2048, + "source_height": 1365, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + }, + "4A94F932-FB23-48AA-AFD3-EDF2875A3F3E": { + "_pk": 34, + "uuid": "4A94F932-FB23-48AA-AFD3-EDF2875A3F3E", + "name": "right2", + "asset_uuid": "C547648F-B778-43B5-B12B-4338B7377D09", + "_person_pk": 37, + "center_x": 0.7118698810452417, + "center_y": 0.5780494076905933, + "center": (590, 575), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (2048, 1365), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (2048, 1365), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (2048, 1365), + "size": 0.08225783705711365, + "face_rect": [ + (505.7679748535156, 490.7679748535156), + (674.2320251464844, 659.2320251464844), + ], + "mpri_reg_rect": { + "x": 0.24700120042620144, + "y": 0.3602421489786489, + "h": 0.08225783705711365, + "w": 0.12341688666151557, + }, + "mwg_rs_area": { + "x": 0.28813011895475826, + "y": 0.4219505923094067, + "h": 0.12341688666151557, + "w": 0.08225783705711365, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 2048, + "source_height": 1365, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + }, + } + }, + { + "4B97B0B4-B5E4-42D2-821F-8926D8B9BEBA": { + "DFEE3150-8D5E-4D55-A507-50A46C7FE8E2": { + "_pk": 28, + "uuid": "DFEE3150-8D5E-4D55-A507-50A46C7FE8E2", + "name": "exif8", + "asset_uuid": "4B97B0B4-B5E4-42D2-821F-8926D8B9BEBA", + "_person_pk": 30, + "center_x": 0.6077711192731491, + "center_y": 0.7344278585926929, + "center": (1504, 829), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (0, 0), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (0, 0), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (0, 0), + "size": 0.16976258158683777, + "face_rect": [ + (1330.1631164550781, 655.1631164550781), + (1677.8368835449219, 1002.8368835449219), + ], + "mpri_reg_rect": { + "x": 0.649546567799274, + "y": 0.4804180910351111, + "h": 0.16976258158683777, + "w": 0.254706056476076, + }, + "mwg_rs_area": { + "x": 0.7344278585926929, + "y": 0.6077711192731491, + "h": 0.254706056476076, + "w": 0.16976258158683777, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 1365, + "source_height": 2048, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + } + } + }, + { + "2C766B95-1D8C-40DA-AD8E-39798BF4576D": { + "4A3085CA-9370-4401-920D-EE827BFB0385": { + "_pk": 14, + "uuid": "4A3085CA-9370-4401-920D-EE827BFB0385", + "name": "", + "asset_uuid": "2C766B95-1D8C-40DA-AD8E-39798BF4576D", + "_person_pk": 5, + "center_x": 0.5148479491472244, + "center_y": 0.37627631425857544, + "center": (1054, 851), + "mouth_x": 0.5168212004211425, + "mouth_y": 0.26665759770107655, + "mouth": (1058, 1001), + "left_eye_x": 0.43235626139945704, + "left_eye_y": 0.5063340759639829, + "left_eye": (885, 673), + "right_eye_x": 0.5781170603291468, + "right_eye_y": 0.504449233726675, + "right_eye": (1183, 676), + "size": 0.37983468174934387, + "face_rect": [ + (665.0492858886719, 462.0492858886719), + (1442.9507141113281, 1239.9507141113281), + ], + "mpri_reg_rect": { + "x": 0.3249306082725525, + "y": 0.33877810763788746, + "h": 0.37983468174934387, + "w": 0.5698911562070742, + }, + "mwg_rs_area": { + "x": 0.5148479491472244, + "y": 0.6237236857414246, + "h": 0.5698911562070742, + "w": 0.37983468174934387, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": 0.6023849248886108, + "source_width": 2048, + "source_height": 1365, + "has_smile": 1, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 0, + "face_type": None, + "age_type": 3, + "bald_type": 3, + "eye_makeup_type": 0, + "eye_state": 2, + "facial_hair_type": 1, + "gender_type": 2, + "glasses_type": 3, + "hair_color_type": 3, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 1, + } + } + }, + { + "687A4CF6-380A-4B6F-A105-7DA04CF72CFD": { + "4355FCE9-C3D1-4F0C-BC3A-9AF30B291346": { + "_pk": 26, + "uuid": "4355FCE9-C3D1-4F0C-BC3A-9AF30B291346", + "name": "exif1", + "asset_uuid": "687A4CF6-380A-4B6F-A105-7DA04CF72CFD", + "_person_pk": 28, + "center_x": 0.6187313813836142, + "center_y": 0.7373562246278755, + "center": (844, 537), + "mouth_x": 0.0, + "mouth_y": 0.0, + "mouth": (0, 2048), + "left_eye_x": 0.0, + "left_eye_y": 0.0, + "left_eye": (0, 2048), + "right_eye_x": 0.0, + "right_eye_y": 0.0, + "right_eye": (0, 2048), + "size": 0.17837372422218323, + "face_rect": [ + (661.3453063964844, 354.3453063964844), + (1026.6546936035156, 719.6546936035156), + ], + "mpri_reg_rect": { + "x": 0.4849184190367163, + "y": 0.17345691326103285, + "h": 0.2676259246937958, + "w": 0.17837372422218323, + }, + "mwg_rs_area": { + "x": 0.6187313813836142, + "y": 0.26264377537212447, + "h": 0.17837372422218323, + "w": 0.2676259246937958, + }, + "roll": 0.0, + "pitch": 0.0, + "yaw": 0.0, + "quality": -1.0, + "source_width": 1365, + "source_height": 2048, + "has_smile": 0, + "left_eye_closed": 0, + "right_eye_closed": 0, + "manual": 1, + "face_type": None, + "age_type": 0, + "bald_type": 0, + "eye_makeup_type": 0, + "eye_state": 0, + "facial_hair_type": 0, + "gender_type": 0, + "glasses_type": 0, + "hair_color_type": 0, + "intrash": 0, + "lip_makeup_type": 0, + "smile_type": 0, + } + } + }, { "916732EA-E357-47E7-894C-DB0692F24327": { "8B80014E-7C4C-4171-84D3-025A0AF048A2": { @@ -2237,46 +3999,46 @@ UUID_LIST_5 = [ } }, { - "9E7D89FF-05C0-415E-BA48-1B3AE8A8A910": { - "DCE806B8-39A9-454A-8FA3-BAD40D9B0A66": { - "_pk": 6, - "uuid": "DCE806B8-39A9-454A-8FA3-BAD40D9B0A66", - "name": "Girl Winking", - "asset_uuid": "9E7D89FF-05C0-415E-BA48-1B3AE8A8A910", - "_person_pk": 21, - "center_x": 0.7959673330187798, - "center_y": 0.5137898772954941, - "center": (1630, 663), - "mouth_x": 0.8051418400925123, - "mouth_y": 0.45098027932299384, - "mouth": (1648, 749), - "left_eye_x": 0.755372609972766, - "left_eye_y": 0.6016391057377022, - "left_eye": (1547, 543), - "right_eye_x": 0.8485378818859849, - "right_eye_y": 0.5883882606575139, - "right_eye": (1737, 561), - "size": 0.22552989423274994, + "82B6F7FA-C552-4A91-9150-372EF3437FDC": { + "5384E868-2CC2-4D2F-B171-46193567073E": { + "_pk": 9, + "uuid": "5384E868-2CC2-4D2F-B171-46193567073E", + "name": "Bald Guy with Beard and Glasses", + "asset_uuid": "82B6F7FA-C552-4A91-9150-372EF3437FDC", + "_person_pk": 17, + "center_x": 0.32925228029489517, + "center_y": 0.5016408860683441, + "center": (674, 680), + "mouth_x": 0.35357513787707784, + "mouth_y": 0.4528046849535592, + "mouth": (750, 712), + "left_eye_x": 0.2717253644791406, + "left_eye_y": 0.5492886026650554, + "left_eye": (539, 682), + "right_eye_x": 0.3415018531310906, + "right_eye_y": 0.578722708157068, + "right_eye": (643, 576), + "size": 0.2136638136289548, "face_rect": [ - (1399.057388305664, 432.05738830566406), - (1860.942611694336, 893.9426116943359), + (455.2082548439503, 461.2082548439503), + (892.7917451560497, 898.7917451560497), ], "mpri_reg_rect": { - "x": 0.6832023859024048, - "y": 0.3170213961885089, - "h": 0.22552989423274994, - "w": 0.33837745303199407, + "x": 0.22242037348041777, + "y": 0.33807212114334106, + "h": 0.2136638136289548, + "w": 0.32057398557662964, }, "mwg_rs_area": { - "x": 0.7959673330187798, - "y": 0.4862101227045059, - "h": 0.33837745303199407, - "w": 0.22552989423274994, + "x": 0.32925228029489517, + "y": 0.4983591139316559, + "h": 0.32057398557662964, + "w": 0.2136638136289548, }, - "roll": 0.0, + "roll": 0.5235987901687622, "pitch": 0.0, "yaw": 0.0, - "quality": 0.40995678305625916, + "quality": 0.5326955318450928, "source_width": 2048, "source_height": 1365, "has_smile": 0, @@ -2284,123 +4046,61 @@ UUID_LIST_5 = [ "right_eye_closed": 0, "manual": 0, "face_type": None, - "age_type": 2, - "bald_type": 3, + "age_type": 5, + "bald_type": 2, "eye_makeup_type": 0, "eye_state": 2, - "facial_hair_type": 1, + "facial_hair_type": 2, "gender_type": 1, - "glasses_type": 3, + "glasses_type": 1, "hair_color_type": 3, "intrash": 0, "lip_makeup_type": 0, - "smile_type": 2, + "smile_type": 1, } } }, { - "A2E762C9-F2A2-4806-9684-D1A78910B71E": { - "3B2DBD1A-1A6C-4278-8BA7-CCC786523159": { - "_pk": 18, - "uuid": "3B2DBD1A-1A6C-4278-8BA7-CCC786523159", - "name": "Statue", - "asset_uuid": "A2E762C9-F2A2-4806-9684-D1A78910B71E", - "_person_pk": 15, - "center_x": 0.4856320488721805, - "center_y": 0.8716400375939848, - "center": (1337, 353), - "mouth_x": 0.0, - "mouth_y": 0.0, - "mouth": (0, 2754), - "left_eye_x": 0.0, - "left_eye_y": 0.0, - "left_eye": (0, 2754), - "right_eye_x": 0.0, - "right_eye_y": 0.0, - "right_eye": (0, 2754), - "size": 0.08544087409973145, - "face_rect": [ - (1219.3479163646698, 235.3479163646698), - (1454.6520836353302, 470.6520836353302), - ], - "mpri_reg_rect": { - "x": 0.44291161182231475, - "y": 0.08563952535614949, - "h": 0.08544087409973145, - "w": 0.08544087409973145, - }, - "mwg_rs_area": { - "x": 0.4856320488721805, - "y": 0.12835996240601522, - "h": 0.08544087409973145, - "w": 0.08544087409973145, - }, - "roll": 0.0, - "pitch": 0.0, - "yaw": 0.0, - "quality": -1.0, - "source_width": 2754, - "source_height": 2754, - "has_smile": 0, - "left_eye_closed": 0, - "right_eye_closed": 0, - "manual": 1, - "face_type": None, - "age_type": 0, - "bald_type": 0, - "eye_makeup_type": 0, - "eye_state": 0, - "facial_hair_type": 0, - "gender_type": 0, - "glasses_type": 0, - "hair_color_type": 0, - "intrash": 0, - "lip_makeup_type": 0, - "smile_type": 0, - } - } - }, - { - "5E461935-2FE5-4762-80D3-FCF70739FFA0": { - "878F66D3-0E53-47C7-BE17-BAC1212EEF47": { - "_pk": 7, - "uuid": "878F66D3-0E53-47C7-BE17-BAC1212EEF47", + "554B190D-B064-479F-89CB-EB2485C3675F": { + "47BA92F0-2083-4AAE-AB79-B741FF8FDEAA": { + "_pk": 17, + "uuid": "47BA92F0-2083-4AAE-AB79-B741FF8FDEAA", "name": "Exif", - "asset_uuid": "5E461935-2FE5-4762-80D3-FCF70739FFA0", + "asset_uuid": "554B190D-B064-479F-89CB-EB2485C3675F", "_person_pk": 16, - "center_x": 0.5060971826314926, - "center_y": 0.4065530300140381, - "center": (811, 1011), - "mouth_x": 0.4947084969874238, - "mouth_y": 0.28146992416738925, - "mouth": (982, 1034), - "left_eye_x": 0.4379364977447421, - "left_eye_y": 0.5229665160904489, - "left_eye": (652, 1151), - "right_eye_x": 0.5447459726413946, - "right_eye_y": 0.5572845329942382, - "right_eye": (605, 932), - "size": 0.3970904248999432, + "center_x": 0.5058241337537766, + "center_y": 0.40621668100357056, + "center": (1035, 811), + "mouth_x": 0.4940449122017374, + "mouth_y": 0.2800719558140182, + "mouth": (1011, 984), + "left_eye_x": 0.4374790271180322, + "left_eye_y": 0.5214642632262265, + "left_eye": (895, 654), + "right_eye_x": 0.5435461602085978, + "right_eye_y": 0.5581745216649008, + "right_eye": (1113, 603), + "size": 0.3930774775217287, "face_rect": [ - (404.3794049024582, 604.3794049024582), - (1217.6205950975418, 1417.6205950975418), + (632.4886630177498, 408.4886630177498), + (1437.5113369822502, 1213.5113369822502), ], "mpri_reg_rect": { - "x": 0.29599225521087646, - "y": 0.2953576049185358, - "h": 0.5949094295501709, - "w": 0.3970904248999432, + "x": 0.3092853949929122, + "y": 0.29933464527130127, + "h": 0.3930774775217287, + "w": 0.5888973474502563, }, "mwg_rs_area": { - "x": 0.5934469699859619, - "y": 0.4939028173685074, - "h": 0.3970904248999432, - "w": 0.5949094295501709, + "x": 0.5058241337537766, + "y": 0.5937833189964294, + "h": 0.5888973474502563, + "w": 0.3930774775217287, }, "roll": 0.0, "pitch": 0.0, "yaw": 0.0, - "quality": 0.6108523607254028, + "quality": 0.6076138019561768, "source_width": 2048, "source_height": 1367, "has_smile": 0, @@ -2422,68 +4122,6 @@ UUID_LIST_5 = [ } } }, - { - "74C3C5B5-F9EB-4527-A03F-8064B1496542": { - "B552E117-9419-441A-B772-36F3C798C1FF": { - "_pk": 16, - "uuid": "B552E117-9419-441A-B772-36F3C798C1FF", - "name": "", - "asset_uuid": "74C3C5B5-F9EB-4527-A03F-8064B1496542", - "_person_pk": 4, - "center_x": 0.5952992588281631, - "center_y": 0.49017810821533203, - "center": (1219, 687), - "mouth_x": 0.5881596664819962, - "mouth_y": 0.3549293373939501, - "mouth": (1204, 869), - "left_eye_x": 0.5232154194375097, - "left_eye_y": 0.6100698135934515, - "left_eye": (1071, 525), - "right_eye_x": 0.6608530058804294, - "right_eye_y": 0.6057527381688228, - "right_eye": (1353, 531), - "size": 0.36225399374961853, - "face_rect": [ - (848.0519104003906, 316.0519104003906), - (1589.9480895996094, 1057.9480895996094), - ], - "mpri_reg_rect": { - "x": 0.4141722619533539, - "y": 0.2346378490549874, - "h": 0.36225399374961853, - "w": 0.5503680854593611, - }, - "mwg_rs_area": { - "x": 0.5952992588281631, - "y": 0.509821891784668, - "h": 0.5503680854593611, - "w": 0.36225399374961853, - }, - "roll": 0.0, - "pitch": 0.0, - "yaw": 0.0, - "quality": 0.6104320287704468, - "source_width": 2048, - "source_height": 1348, - "has_smile": 0, - "left_eye_closed": 0, - "right_eye_closed": 0, - "manual": 0, - "face_type": None, - "age_type": 3, - "bald_type": 3, - "eye_makeup_type": 0, - "eye_state": 2, - "facial_hair_type": 1, - "gender_type": 2, - "glasses_type": 3, - "hair_color_type": 1, - "intrash": 0, - "lip_makeup_type": 0, - "smile_type": 2, - } - } - }, ]