47 Коммитов

Автор SHA1 Сообщение Дата
pre-commit-ci[bot]
35f63f0b74 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-04-02 12:32:29 +00:00
Petr Andriushchenko
0fd6962dd3
Merge branch 'main' into add_itm 2023-04-02 14:32:18 +02:00
Inga Ulusoy
3b1c3ef1ed
add text classification transformers (#68)
* add text classification transformers

* add ner

* use specified model for tasks; allow summary in BERT

* update notebooks and dockerfile

* links for notebooks on colab

* links for notebooks on colab

* update notebooks image path for colab
2023-04-02 14:36:08 +03:00
Petr Andriushchenko
502683f420
fixed strange lines in multimodal_search notebook 2023-03-31 23:21:42 +02:00
Petr Andriushchenko
3b28fe25a3
Merge branch 'main' into add_itm 2023-03-31 23:14:35 +02:00
Petr Andriushchenko
14a1a03597
fixed saving path, added tmp_path (#67) 2023-03-31 12:36:58 -07:00
Petr Andriushchenko
5441edf2d6
Merge branch 'main' into add_itm 2023-03-31 15:23:15 +02:00
Petr Andriushchenko
f1aeeabd18
fixed varible name, uncomment test, exluded it from CI, fixed error in multimodal_search 2023-03-31 13:35:04 +02:00
Inga Ulusoy
0ae872e750 fix code smells, test notebook 2023-03-31 11:21:08 +02:00
pre-commit-ci[bot]
f89fa4e519
[pre-commit.ci] pre-commit autoupdate (#46)
* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/psf/black: 22.12.0 → 23.1.0](https://github.com/psf/black/compare/22.12.0...23.1.0)
- [github.com/psf/black: 22.12.0 → 23.1.0](https://github.com/psf/black/compare/22.12.0...23.1.0)
- [github.com/s-weigand/flake8-nb: v0.5.0 → v0.5.2](https://github.com/s-weigand/flake8-nb/compare/v0.5.0...v0.5.2)

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

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

* Update .pre-commit-config.yaml

* run hooks

---------

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 19:39:21 +02:00
Petr Andriushchenko
f7081d6878
merge main to add_itm, fixed saving path, added tmp_path 2023-03-30 13:45:30 +02:00
Petr Andriushchenko
46d5d43f0b
merge main to add_itm 2023-03-30 13:43:06 +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
Petr Andriushchenko
cc3d7f3aa8
merge main to add_itm 2023-03-23 17:09:07 +01:00
Petr Andriushchenko
16fb5a02ee
fixed itm functionality 2023-03-23 16:40:48 +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
Petr Andriushchenko
65dbf28eef
added new itm functionality 2023-03-15 16:04:43 +01:00
Petr Andriushchenko
24ee78c23e
added filtering function 2023-03-09 15:45:06 +01:00
Petr Andriushchenko
56bb70384a fixed imort torch in utils 2023-02-24 12:00:48 +01:00
Petr Andriushchenko
e6552cb887 moved some function to utils 2023-02-24 11:51:08 +01:00
Petr Andriushchenko
f4e47c105e fixed new model in summary.py 2023-02-24 10:47:52 +01:00
Petr Andriushchenko
4e4b7fac75 fix if-else, added clip ViT-L-14=336 model 2023-02-22 14:22:58 +01:00
Inga Ulusoy
779c5227ae changed imports bec of lavis/windows 2023-02-21 22:45:06 +01:00
Inga Ulusoy
2e40179a68 account for new interface in init imports 2023-02-21 21:32:24 +01:00
pre-commit-ci[bot]
b9158d4947 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-17 14:17:22 +00:00
Petr Andriushchenko
70866dfc69 Change input format for multimodal search 2023-02-17 15:14:42 +01:00
pre-commit-ci[bot]
eb48b6513f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-16 09:02:14 +00:00
Petr Andriushchenko
0b140c2245 Merge branch 'add_multimodal_search' into add_image_summary 2023-02-16 10:01:26 +01:00
Petr Andriushchenko
7f7d0d2913 adding multimodal searching py and notebook 2023-02-15 16:23:10 +01:00
Inga Ulusoy
f787164572
Merge branch 'main' into add_image_summary 2023-02-14 04:10:31 -08: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
ee2208091e
Merge branch 'main' into add_image_summary 2023-01-30 12:06:31 +01:00
pre-commit-ci[bot]
be80dea7b3 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-01-27 13:09:51 +00:00
Petr Andriushchenko
372a09454e add image summary notebook 2023-01-27 14:04:54 +01:00
Inga Ulusoy
b0ae2f2c19
update install branch (#51) 2023-01-12 13:42:38 +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
b585097f19
remove obsolete features (#48)
* reduce code smells

* account for transl. version change

* remove print statements

* remove imageai
2022-12-31 22:15:40 +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
xianghe ma
d07c54b096 add crop posts 2022-10-14 01:20:47 +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
Inga Ulusoy
d4cda187e3
Facial expression dict (#24)
* convert into dict output

* faces class

* return cleaned dict

* empty methods that are required

* with dict updates

* with dominant emotion confidence as tuple

* multiple images

* update notebook
2022-08-17 23:00:46 +02:00
Inga Ulusoy
995cfec923
dict handling down to and from analysis routines (#19) 2022-08-07 20:48:21 +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
2d06cd290a Use a widget layout for exploration that shows all filenames 2022-07-13 16:22:26 +02:00
Dominic Kempf
2d3ea26007 Add DeepFace exploration notebook and Python package 2022-07-12 16:52:58 +02:00
iulusoy
612d8b563c initial setup 2022-07-07 11:18:56 +02:00