265 Коммитов

Автор SHA1 Сообщение Дата
Petr Andriushchenko
388ff19b38 back to 3.9 and remove pycocotools dependance 2023-02-03 14:12:06 +01:00
Petr Andriushchenko
0b197db397 Downgrade Python 2023-02-03 11:45:43 +01:00
Petr Andriushchenko
be5f6698a9 fix_pycocotools 2023-02-03 11:41:23 +01:00
Petr Andriushchenko
2b06dc25cc change pycocotools install method 2023-02-02 14:45:34 +01:00
Petr Andriushchenko
6669fc4e4d change pycocotools install method 2023-02-02 14:32:54 +01:00
Petr Andriushchenko
2367593034 change lavis to salesforce-lavis 2023-02-02 14:27:27 +01:00
Petr Andriushchenko
a7970b5858 return lavis 2023-02-02 14:22:38 +01:00
Petr Andriushchenko
e51ea784df merging 2023-02-02 14:18:13 +01:00
Inga Ulusoy
a2c0bcd66c Merge branch 'add_image_summary' of https://github.com/ssciwr/misinformation into add_image_summary 2023-01-30 12:21:42 +01:00
Inga Ulusoy
38abfa69e9 no lavis for ci test 2023-01-30 12:21:33 +01:00
Inga Ulusoy
ee2208091e
Merge branch 'main' into add_image_summary 2023-01-30 12:06:31 +01:00
Inga Ulusoy
f6a384672e test ci without lavis 2023-01-30 12:01:40 +01:00
Inga Ulusoy
0a017b10ec
version bumps and restrictions (#58)
* fix deepface version

* update actions versions
2023-01-30 12:00:13 +01:00
iulusoy
74b752cfaf update actions version for checkout and python 2023-01-28 23:16:02 +01:00
iulusoy
690a4e4dae pin deepface version to avoid bug with progress bar after update 2023-01-27 21:18:04 +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
4744ed5256
add sphinx documentation files (#47)
* add sphinx doc

* add github pages files

* create docs workflow

* add sphinx requirements

* add napoleon ext

* fix name typo
2022-12-20 19:49:39 +01:00
Dominic Kempf
c49a85bc65
[skip ci] Github Actions badge (#45)
There has been a backwards-incompatible change to shields.io badges for Github Actions. They now identify workflows by their filename instead of their name field.
2022-12-20 11:23:21 +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
Dominic Kempf
f99d15cf40
Restrict the scope of facial expression recognition by thresholding likelihood (#38)
* Apply thresholding to restrict the scope of facial expression recognition

* fix test dict faces

* remove approx

* do not ignore data in subdirs

* where does test_display come from

* remove face analysis duplication

* imageai sneaked into ci

Co-authored-by: Inga Ulusoy <inga.ulusoy@uni-heidelberg.de>
2022-12-13 13:15:56 +01:00
Dominic Kempf
ef305ee94c
Fix ID generation for relative paths (#35)
So far, there was implicit assumption on the used paths being absolute.

Co-authored-by: Inga Ulusoy <inga.ulusoy@uni-heidelberg.de>
2022-12-13 11:33:34 +01:00
pre-commit-ci[bot]
81838d0b86
[pre-commit.ci] pre-commit autoupdate (#34)
* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/psf/black: 22.10.0 → 22.12.0](https://github.com/psf/black/compare/22.10.0...22.12.0)
- [github.com/pycqa/flake8: 5.0.4 → 6.0.0](https://github.com/pycqa/flake8/compare/5.0.4...6.0.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)

* fix flake8-nb version

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>
2022-12-13 11:33:20 +01:00
Inga Ulusoy
6e7df1eb9f
fix code smells (#39)
* fix code smells

* circumvent code coverage
2022-10-27 13:35:37 +02: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
9b3e3796fa
test on win (#33)
* test on win

* fix linter issues
2022-10-17 10:43:42 +02:00
xianghe ma
d07c54b096 add crop posts 2022-10-14 01:20:47 +02:00
pre-commit-ci[bot]
57cfb41aa0
[pre-commit.ci] pre-commit autoupdate (#31)
* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/psf/black: 22.8.0 → 22.10.0](https://github.com/psf/black/compare/22.8.0...22.10.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)

* fix flake8 version

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>
2022-10-13 14:39:33 +02:00
Inga Ulusoy
37d07da98a
Accuracy test (#32)
* 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

* use copy instead of symlink on windows

* crude attempt at calculating deviations

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2022-10-13 14:32:45 +02:00
Inga Ulusoy
cf226ce535
Include badges (#30)
* added badges

* Update README.md

* correct language detection of the package
2022-10-05 13:43:12 +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
pre-commit-ci[bot]
1f8166e731
[pre-commit.ci] pre-commit autoupdate (#28)
* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/kynan/nbstripout: 0.6.0 → 0.6.1](https://github.com/kynan/nbstripout/compare/0.6.0...0.6.1)

* reduce flake8-nb version to keep from failing

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>
2022-10-04 13:06:08 +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
pre-commit-ci[bot]
f5d24a1b1d
[pre-commit.ci] pre-commit autoupdate (#25)
updates:
- [github.com/psf/black: 22.6.0 → 22.8.0](https://github.com/psf/black/compare/22.6.0...22.8.0)
- [github.com/s-weigand/flake8-nb: v0.4.0 → v0.5.2](https://github.com/s-weigand/flake8-nb/compare/v0.4.0...v0.5.2)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2022-09-21 21:40:21 +02:00
Dominic Kempf
0cca224cd0
Merge pull request #27 from ssciwr/ipywidgets-8
ipywidgets 8 was released
2022-09-05 10:30:52 +02:00
Dominic Kempf
9eb9308320 ipywidgets 8 was released 2022-09-05 10:23:25 +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
pre-commit-ci[bot]
d273e7a2e3
[pre-commit.ci] pre-commit autoupdate (#21)
updates:
- [github.com/pycqa/flake8: 5.0.2 → 5.0.4](https://github.com/pycqa/flake8/compare/5.0.2...5.0.4)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2022-08-15 13:49:58 +02:00
Inga Ulusoy
995cfec923
dict handling down to and from analysis routines (#19) 2022-08-07 20:48:21 +02:00
pre-commit-ci[bot]
90c6087fdf
[pre-commit.ci] pre-commit autoupdate (#20)
updates:
- [github.com/pycqa/flake8: 4.0.1 → 5.0.2](https://github.com/pycqa/flake8/compare/4.0.1...5.0.2)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2022-08-02 11:55:49 +02:00
pre-commit-ci[bot]
bef4940d04
[pre-commit.ci] pre-commit autoupdate (#8)
updates:
- [github.com/kynan/nbstripout: 0.5.0 → 0.6.0](https://github.com/kynan/nbstripout/compare/0.5.0...0.6.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2022-07-27 22:43:33 +02:00
Dominic Kempf
be04f79933
Fix installation into Docker image (#7)
* 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

* Fix installation into Docker image

* Install C++ compiler, not only C
* Automatically install requirements.txt stuff
* Write pytesseract into requirements file

Co-authored-by: iulusoy <inga.ulusoy@uni-heidelberg.de>
2022-07-27 22:43:16 +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
7aa1247766
Merge pull request #6 from ssciwr/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-07-19 09:36:17 +02:00
pre-commit-ci[bot]
0ec2a2793a
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/s-weigand/flake8-nb: v0.3.1 → v0.4.0](https://github.com/s-weigand/flake8-nb/compare/v0.3.1...v0.4.0)
2022-07-18 17:45:47 +00:00
Dominic Kempf
8df9522550
Merge pull request #5 from ssciwr/three-faces
Detect up to 3 faces
2022-07-18 13:37:44 +02:00