50 Коммитов

Автор SHA1 Сообщение Дата
dependabot[bot]
2af03546f5
Update deepface requirement from <=0.0.92 to <=0.0.93 (#209)
Updates the requirements on [deepface](https://github.com/serengil/deepface) to permit the latest version.
- [Release notes](https://github.com/serengil/deepface/releases)
- [Commits](https://github.com/serengil/deepface/compare/v0.0.81...v0.0.93)

---
updated-dependencies:
- dependency-name: deepface
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-26 09:19:54 +02:00
dependabot[bot]
b3ba545e4f
Bump googletrans from 3.1.0a0 to 4.0.0rc1 (#197)
Bumps [googletrans](https://github.com/ssut/py-googletrans) from 3.1.0a0 to 4.0.0rc1.
- [Release notes](https://github.com/ssut/py-googletrans/releases)
- [Commits](https://github.com/ssut/py-googletrans/commits)

---
updated-dependencies:
- dependency-name: googletrans
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-06-14 08:16:55 +02:00
dependabot[bot]
42b6732308
Update deepface requirement from <=0.0.75 to <=0.0.92 (#203)
* Update deepface requirement from <=0.0.75 to <=0.0.92

---
updated-dependencies:
- dependency-name: deepface
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* more extensive testing for faces, adapt changes from deepface

* include gender threshold in display and notebook

* update documentation

* increase detection threshold for tests

* update handling of missing dict keys

* update notebook

* make sure text was found on image before analysing

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Inga Ulusoy <inga.ulusoy@uni-heidelberg.de>
2024-06-13 14:34:14 +02:00
Inga Ulusoy
17846fbe71
Update lavis dependencies (#204) 2024-06-12 20:32:26 +02:00
Inga Ulusoy
894ad0938b
add disclaimer checks and tests (#202)
* add disclaimer checks and tests

* add changes to display

* webcolors library update changes

* disclosure instead of disclaimer

* change interface to disclosure

* update demo notebook

* improve explorer display of disclosure env variable, update docs notebook
2024-06-12 09:49:35 +02:00
dependabot[bot]
9202f51d9f
Update torch requirement from <2.1.0 to <2.4.0 (#193)
Updates the requirements on [torch](https://github.com/pytorch/pytorch) to permit the latest version.
- [Release notes](https://github.com/pytorch/pytorch/releases)
- [Changelog](https://github.com/pytorch/pytorch/blob/main/RELEASE.md)
- [Commits](0a9dbbbaad...v2.3.0)

---
updated-dependencies:
- dependency-name: torch
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-05-31 14:29:56 +02:00
Inga Ulusoy
38498e3e10
use simpler image for testing emotion detector (#190)
* use simpler image for testing

* include age in faces test again

* fix typo

* try with newer tensorflow version

* remove testing for age again

* try with tensorflow newer versions only for breaking change in transformers

* force transformers to use pytorch
2024-05-31 11:43:26 +02:00
Inga Ulusoy
8752398c5d
Update documentation (#185)
* update documentation

* remove obsolete notebooks

* comment on data usage and internet access
2024-02-19 10:20:21 +01:00
Petr Andriushchenko
bec845e774
Minor fixing (#172)
* fixing DemoNotebook

* fixing DemoNotebook2

* rearrange the code and text

* continiue changing demo notebook

* continiue changing demo notebook2

* fixing bug on a100 in google colab

* change order of tests and do not test for age in faces

* add screenshots for gcv api

* instructions for google cloud vision API

* link instructions in readme

* add missing image

* trim whitespace

---------

Co-authored-by: Inga Ulusoy <inga.ulusoy@uni-heidelberg.de>
2024-02-16 09:05:39 +01:00
Inga Ulusoy
721bc98f7a
increment version number (#168)
* increment version number

increment version number for automated release with new dependency ammico-lavis

* only upload to testpypi for new release tag

* change codecov token transmission method
2024-01-15 11:59:18 +01:00
Petr Andriushchenko
291551235d
checking original lavis (#166)
* changed salesforce-lavis to ammico-lavis lib
2023-12-07 13:36:16 +01:00
GwydionJon
0da40e018e
removed dash render-json (#167)
removed dash render-json
2023-12-06 13:38:37 +01:00
Petr Andriushchenko
434e0181f5
checking dependencies (#158)
* changed some dependencies
2023-10-20 14:08:44 +02:00
Petr Andriushchenko
b0a623625f
remove object_detector (#157)
* `Object_Detector` has been removed  from the project

---------

Co-authored-by: Inga Ulusoy <inga.ulusoy@uni-heidelberg.de>
2023-10-19 10:43:25 +02:00
Petr Andriushchenko
8118aa4830
Change summary parameter (#153)
* changed `3_non-deterministic summary` to `3_non-deterministic_summary`

* changed cvlib to working fork

* disabled test_display
2023-10-18 23:28:38 +02:00
Inga Ulusoy
fc68010e70 increment release number 2023-09-13 14:38:59 +02:00
GwydionJon
e120c10d9f
Fix dash layout (#143)
* force_rounding_of_all_colors

* update test

* fixed bug in color analysis

* changed color rounding to seperate loop

* updated to new dash layout using dbc

* removed dash server from test

* added dash version to pyproject.toml

* changed something to get codecov to work

* changed something else to get codecov to work..

* added test_right_output_analysis_text

* fix type in dependencies

* removed test_text from display

---------

Co-authored-by: Inga Ulusoy <inga.ulusoy@uni-heidelberg.de>
2023-08-31 11:00:30 +02:00
Inga Ulusoy
e11d4c05f4
Update notebooks and add options in display for text model names (#133)
* updated notebooks for the new interface

---------

Co-authored-by: Petr Andriushchenko <pitandmind@gmail.com>
2023-07-12 09:31:58 +02:00
Petr Andriushchenko
4cecd7ea4f
package data fixing (#131)
* added ammico.data to namespace of packagees tool.setuptools

* limited tensorflow version up to 2.12.3 due to the bug https://github.com/huggingface/transformers/issues/23352
2023-07-07 13:58:24 +02:00
Petr Andriushchenko
875b5c5e0e
Macos debugging (#127)
* returned object_tests on macOS

* fixed scikit-learn 1.3.0 bug
2023-07-03 16:18:27 +02:00
Petr Andriushchenko
1914424cf8
Added Windows instruction in README (#128)
* added instructions to the readme.md about installing the package on Windows OS

* fixed 1.3.0 scikit-learn bug
2023-07-03 14:03:09 +02:00
Inga Ulusoy
75e9f49370
add color table to package data (#124)
* add color table to package data

* added importlib-resources to puproject.toml

---------

Co-authored-by: Petr Andriushchenko <pitandmind@gmail.com>
2023-06-26 13:34:53 +02:00
GwydionJon
1d9e1338ea
Improve colors expression (#80)
* increased dash width

* added new color_analysis notebook

* added colorgram.py to dependencies

* added first iteration of new color_check

* added new version of color analysis

* added webcolors to dependencies

* added colormath

* switched from colormath to colour-science

* made delta_e algorithm user accessible

* remove obsolete notebook

* update docstrings and type hints

* add color analysis module to API doc

* renamed color_expressions to color_analysis

* renamed test

* updated color analysis notebook to adhere to the same style as other notebooks

* updated test for new df orientation

* refactored color analysis to comply with ammico workflow

* updated color tests to comply with new class structure

* added explanation to colors_analysis notebook

* added class doc string

* updated analysis explorer test to include empty image keyword as dash observer

* fix typo and names, docstring and import

* update doc and notebook explanation

* add project url for pypi

---------

Co-authored-by: Inga Ulusoy <inga.ulusoy@uni-heidelberg.de>
2023-06-22 13:58:49 +02:00
Inga Ulusoy
c9422a77ec
cleanup-minor-issues (#91)
* clean up docstrings

* clean up docstrings 2

* temp integration test module

* cleaner text sample to analyse

* remove clean text and spelling corrections

* change ammico exposed interface
2023-06-20 10:31:13 +02:00
Petr Andriushchenko
8ea7903806
Fixing macos compatibility (#92)
* changed salesforce-lavis to fork with MacOS compatibility (release 1.0.2)

* added macos to CI
2023-06-19 11:05:38 +02:00
GwydionJon
44e5a987b1
Improve documentation (#89)
* updated documentation in cropposts

* updated documentation in display

* updated documentation in faces

* added comments to objects.py

* updated utils.py docs

* updated text.py docs

* improve doc display

* fix doc for display and remove redundant variable

* removed documentation from cropposts.py

* removed unused imports

* get rid of ipywidgets dependency

* remove unused imports, improve type hints

* improve doc in utils

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: Inga Ulusoy <inga.ulusoy@uni-heidelberg.de>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2023-06-14 22:17:20 +02:00
Inga Ulusoy
4628692e95
update post cropping notebook (#75) 2023-06-14 19:46:18 +02:00
Inga Ulusoy
125c31b7a6
skip summary if translation failed (#86)
* skip summary if translation failed

* restrict bertopic version
2023-06-01 14:02:06 +02:00
GwydionJon
530c8525a8
Switching ipywidgets to dash (#73)
* added dash app instead of ipywidgets

* added pre-commit

* removed ipywidgets function

* added dash to dependencies

* exempted dash server from tests

* put das explorer app in new class

* added variable for img path in tests

* added new explorer class to all notebooks

* added identif class variable

* removed unused argument in test_display

* more cleanup, more text analysis in notebook

* update NER test

* update with more comments and fix dash calls

* update text description multimodal

* update objects description

---------

Co-authored-by: Inga Ulusoy <inga.ulusoy@uni-heidelberg.de>
2023-05-05 09:12:38 +02:00
Petr Andriushchenko
622ba40964
rename misinformation to ammico 2023-04-24 17:03:58 +02:00
Inga Ulusoy
cf1e1b83d7 add text summary 2023-03-30 11:23:01 +02:00
Petr Andriushchenko
a5c43b6488
Test debugging (#62)
* deleted lavis from utils

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixed test_objects

* added 'not gcv' to CI

* fixed multimodal search and summary tests

* disable doc build on PR for now

* restrict ipywidgets version to avoid dummycomm error

* limit deepface version

* original repositories for retinaface lavis

* update gcv test results

* update display test outputs

* update test env

* run all tests

* wo xdist to avoid segfault

* remove widgets ref

* skip long-running tests

* skip long

* verbose codecov upload

* refactor summary test 2

* finish summary test refactor

* reduce memory overhead of SummaryDetector

* remove VQA models from self

* remove VQA models from self

* update notebook for changes

* update notebook for changes

* fixed multimodal search tests

* fixed tests in multimodal search after precommit

* run all tests

* update doc notebook for summary changes

* skip long-running multimodal

* exclude blip2 from testing

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Inga Ulusoy <inga.ulusoy@uni-heidelberg.de>
2023-03-30 10:33:05 +02:00
Inga Ulusoy
0ca9366980
update docs and google auth (#63)
* update notebooks and google auth

* update readme and text

* google cred

* update secret name

* add pandocto CI

* pandoc step

* install pandoc

* correct typo
2023-03-23 14:07:30 +01:00
Inga Ulusoy
6eff8b8145
Update doc (#61)
* add image summary notebook

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* pin deepface version to avoid bug with progress bar after update

* update actions version for checkout and python

* test ci without lavis

* no lavis for ci test

* merging

* return lavis

* change lavis to salesforce-lavis

* change pycocotools install method

* change pycocotools install method

* fix_pycocotools

* Downgrade Python

* back to 3.9 and remove pycocotools dependance

* instrucctions for windows

* missing comma after merge

* lavis only for ubuntu

* use lavis package name in install instead of git

* adding multimodal searching py and notebook

* exclude lavis on windows

* skip import on windows

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* reactivate lavis

* Revert "reactivate lavis"

This reverts commit ecdaf9d316e4b08816ba62da5e0482c8ff15b14e.

* Change input format for multimodal search

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix clip models

* account for new interface in init imports

* changed imports bec of lavis/windows

* fix if-else, added clip ViT-L-14=336 model

* fix code smells

* add model change function to summary

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixed new model in summary.py

* fixed summary windget

* moved some function to utils

* fixed imort torch in utils

* added test_summary.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixed opencv version

* added first test of multimodal_search.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixed test

* removed windows in CI and added test in multimodal search

* change lavis from dependencies from pip ro git

* fixed blip2 model in test_multimodal_search.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixed test multimodal search on cpu and gpu machines

* added test, fixed dependencies

* add -vv to pytest command in CI

* added test_multimodal_search tests

* fixed tests in test_multimodal_search.py

* fixed tests in test_summary

* changed CI and fixed test_multimodel search

* fixed ci

* fixed error in test multimodal search, changed ci

* added multimodal search test, added windows CI, added picture in test data

* CI debuging

* fixing tests in CI

* fixing test in CI 2

* fixing CI 3

* fixing CI

* added filtering function

* Brought back all tests after CI fixing

* changed CI one pytest by individual tests

* fixed opencv problem

* fix path for text, adjust result for new gcv

* remove opencv

* fixing cv2 error

* added opencv-contrib, change objects_cvlib

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixing tests in CI

* fixing CI testing

* fixing codecov in CI

* fixing codecov in CI

* run tests together; install opencv last

* update requirements for opencv dependencies

* first doc updates

* more changes to doc notebooks

---------

Co-authored-by: Petr Andriushchenko <pitandmind@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2023-03-22 10:56:10 +01:00
Petr Andriushchenko
2891c8a6ed
add image summary notebook (#57)
* add image summary notebook

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* pin deepface version to avoid bug with progress bar after update

* update actions version for checkout and python

* test ci without lavis

* no lavis for ci test

* merging

* return lavis

* change lavis to salesforce-lavis

* change pycocotools install method

* change pycocotools install method

* fix_pycocotools

* Downgrade Python

* back to 3.9 and remove pycocotools dependance

* instrucctions for windows

* missing comma after merge

* lavis only for ubuntu

* use lavis package name in install instead of git

* adding multimodal searching py and notebook

* exclude lavis on windows

* skip import on windows

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* reactivate lavis

* Revert "reactivate lavis"

This reverts commit ecdaf9d316e4b08816ba62da5e0482c8ff15b14e.

* Change input format for multimodal search

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix clip models

* account for new interface in init imports

* changed imports bec of lavis/windows

* fix if-else, added clip ViT-L-14=336 model

* fix code smells

* add model change function to summary

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixed new model in summary.py

* fixed summary windget

* moved some function to utils

* fixed imort torch in utils

* added test_summary.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixed opencv version

* added first test of multimodal_search.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixed test

* removed windows in CI and added test in multimodal search

* change lavis from dependencies from pip ro git

* fixed blip2 model in test_multimodal_search.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixed test multimodal search on cpu and gpu machines

* added test, fixed dependencies

* add -vv to pytest command in CI

* added test_multimodal_search tests

* fixed tests in test_multimodal_search.py

* fixed tests in test_summary

* changed CI and fixed test_multimodel search

* fixed ci

* fixed error in test multimodal search, changed ci

* added multimodal search test, added windows CI, added picture in test data

* CI debuging

* fixing tests in CI

* fixing test in CI 2

* fixing CI 3

* fixing CI

* added filtering function

* Brought back all tests after CI fixing

* changed CI one pytest by individual tests

* fixed opencv problem

* fix path for text, adjust result for new gcv

* remove opencv

* fixing cv2 error

* added opencv-contrib, change objects_cvlib

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixing tests in CI

* fixing CI testing

* cleanup objects

* fixing codecov in CI

* fixing codecov in CI

* run tests together; install opencv last

* update requirements for opencv dependencies

* moved lavis functions from utils to summary

* Remove lavis from utils.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add missing jupyter

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: iulusoy <inga.ulusoy@uni-heidelberg.de>
2023-03-22 10:28:09 +01:00
Inga Ulusoy
a6578cfdf3
Topic analysis (#53)
* add bertopic to requirements

* basic topic modeling

* topic modeling using BERT; bugfix if no text on post

* update for google colab

* Catch connection errors

* replace newline character with space

* move topic analysis into PostprocessText class

* set up dataflow topic analysis

* expose topic model to UI

* tests for class init

* tests for topic analysis

* more tests

* take care of carriage return on windows

* take care of carriage return on windows

* take care of carriage return on windows

* set encoding to ensure windows compatibility

* track encoding error

* more debug

* skip topic analysis debug

* windows fixes
2023-02-13 11:45:24 +01:00
Inga Ulusoy
0a017b10ec
version bumps and restrictions (#58)
* fix deepface version

* update actions versions
2023-01-30 12:00:13 +01:00
Inga Ulusoy
5d033479ce
Set up colab (#50)
* lower python version for google colab

* faces working with colab

* text for colab

* fix dict update bug

* final edits for colab

* update readme with links

* load text models on demand

* update test

* fix typo; more description in readme

* remove optional keys
2023-01-12 12:57:14 +01:00
Inga Ulusoy
54728e02bb
Text cleanup and sentiment analysis (#49)
* update notebook

* comments

* add jupyterlab

* add text analysis capability

* add bool in tests

* add dependencies and spelling test

* add test sentiment

* update black pre-commit dependency for native nb support

* update black version, find better sentiment test

* test analyse_image
2023-01-11 12:58:02 +01:00
Inga Ulusoy
25ed5881a1
Text 2 (#42)
* start with translate

* translate and clean - notebook

* spacy model in requirements

* translate in module

* clean in module

* upload coverage only for ubuntu

* update ubuntu version on runner

* update dependencies

* start tests for text

* skip gcv test

* fix age

* more text tests

* more text tests

* add comment

* test translation

* fix numpy version; add reference data for trans

* use utf-8 for windows
2022-12-19 15:03:05 +01:00
Inga Ulusoy
27732c5fab
Tests (#37)
* add py test

* update dependencies and markers

* Update ci.yml

* fix linting

* trying with editable install for cov

* fix code smells

* fix code smells

Co-authored-by: xianghe ma <maxianghe@outlook.com>
2022-10-27 11:17:42 +02:00
Inga Ulusoy
2dd1a7952f
Create ci.yml (#29)
* Create ci.yml

* include pytest

* Update pyproject.toml

* include pytest-cov

* use approx in pytest

* Update test_faces.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add coverage yaml

* reduce passing grade

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2022-10-05 11:25:48 +02:00
xiaohemaikoo
fdcb228294
M objdect (#23)
* colors expression by KMean algorithm

* object detection by imageai

* object detection by cvlib

* add encapsulation of object detection

* remove encapsulation of objdetect v0

* objects expression to dict

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* added imageai to requirements

* add objects to dictionary

* update for AnalysisMethod baseline

* add objects dection support explore_analysis display

* extend python version of misinf to allow imageai

* account for older python

* use global functionality for dict to csv convert

* update for docker build

* docker will build now but ipywidgets still not working

* test code

* include test data folder in repo

* add some sample images

* load cvs labels to dict

* add test data

* retrigger checks

* add map to human coding

* get orders from dict, missing dep

* add module to test accuracy

* retrigger checks

* retrigger checks

* now removing imageai

* removed imageai

* move labelmanager to analyse

* multiple faces in mydict

* fix pre-commit issues

* map mydict

* hide imageai

* objects default using cvlib, isolate and disable imageai

* correct python version

* refactor faces tests

* refactor objects tests

* sonarcloud issues

* refactor utils tests

* address code smells

* update readme

* update notebook without imageai

Co-authored-by: Ma Xianghe <825074348@qq.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: iulusoy <inga.ulusoy@uni-heidelberg.de>
2022-10-04 11:34:44 +02:00
Dominic Kempf
9eb9308320 ipywidgets 8 was released 2022-09-05 10:23:25 +02:00
Inga Ulusoy
446da693e3
Text on image 1 (#4)
* read image into nb

* test

* added keras-ocr and google vision

* google cloud vision by far the best

* setting up docker for text 1

* move widgets and analysis to display module

* move widgets and analysis to display module - 2

* text on image through widgets
2022-07-27 22:41:13 +02:00
Dominic Kempf
a6a4d4aff0 Add a prefetching mechanism for trained models 2022-07-14 14:52:54 +02:00
Dominic Kempf
547e31a1c7 Use pooch instead of bundling pre-trained model 2022-07-14 11:30:12 +02:00
Dominic Kempf
f20ebd8f05 Correct retinaface package name 2022-07-13 10:44:28 +02:00
Dominic Kempf
d2c68da482 Restrict to using the biggest face if multiple faces are present in the image 2022-07-13 10:26:20 +02:00
Dominic Kempf
2d3ea26007 Add DeepFace exploration notebook and Python package 2022-07-12 16:52:58 +02:00