Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot[bot]
2f008bcfbf
Bump sentry-sdk from 1.35.0 to 1.38.0
Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 1.35.0 to 1.38.0.
- [Release notes](https://github.com/getsentry/sentry-python/releases)
- [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-python/compare/1.35.0...1.38.0)

---
updated-dependencies:
- dependency-name: sentry-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-11-29 14:26:55 +00:00
11 changed files with 1314 additions and 16 deletions

View File

@ -12,6 +12,7 @@ https://git.akarpov.ru/sanspie/akarpov
### installation ### installation
```shell ```shell
$ poetry install & poetry shell $ poetry install & poetry shell
$ ./spacy_setup.sh
$ python3 manage.py migrate $ python3 manage.py migrate
``` ```

View File

@ -10,8 +10,8 @@ def extract_file_text(file: str) -> str:
try: try:
rawdata = open(file, "rb").read() rawdata = open(file, "rb").read()
enc = chardet.detect(rawdata) enc = chardet.detect(rawdata)
with open(file, encoding=enc["encoding"]) as f: with open(file, encoding=enc["encoding"]) as file:
text = f.read() text = file.read()
except Exception: except Exception:
return "" return ""

View File

@ -1,7 +1,7 @@
from config.celery_app import app from config.celery_app import app
def get_scheduled_tasks_name() -> list[str]: def get_scheduled_tasks_name() -> [str]:
i = app.control.inspect() i = app.control.inspect()
t = i.scheduled() t = i.scheduled()
all_tasks = [] all_tasks = []

View File

@ -52,6 +52,10 @@ COPY ./compose/local/django/start /start
RUN sed -i 's/\r$//g' /start RUN sed -i 's/\r$//g' /start
RUN chmod +x /start RUN chmod +x /start
COPY ./compose/local/django/spacy_setup /spacy_setup
RUN sed -i 's/\r$//g' /spacy_setup
RUN chmod +x /spacy_setup
COPY ./compose/local/django/start-redirect /start-redirect COPY ./compose/local/django/start-redirect /start-redirect
RUN sed -i 's/\r$//g' /start-redirect RUN sed -i 's/\r$//g' /start-redirect
RUN chmod +x /start-redirect RUN chmod +x /start-redirect

View File

@ -0,0 +1,3 @@
python -m spacy download en_core_web_lg
python -m spacy download xx_sent_ud_sm
python -m spacy download ru_core_news_lg

View File

@ -7,4 +7,4 @@ set -o nounset
python manage.py migrate auth python manage.py migrate auth
python manage.py migrate python manage.py migrate
daphne config.asgi:application --port 8000 --bind 0.0.0.0 python manage.py runserver_plus 0.0.0.0:8000

View File

@ -4,14 +4,8 @@
from django.conf import settings from django.conf import settings
from django.core.asgi import get_asgi_application from django.core.asgi import get_asgi_application
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local") from akarpov.common.channels import HeaderAuthMiddleware
# Initialize Django ASGI application early to ensure the AppRegistry from config import routing
# is populated before importing code that may import ORM models.
django_asgi_app = get_asgi_application()
from akarpov.common.channels import HeaderAuthMiddleware # noqa
from config import routing # noqa
if settings.DEBUG: if settings.DEBUG:
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
@ -20,7 +14,7 @@
application = ProtocolTypeRouter( application = ProtocolTypeRouter(
{ {
"http": django_asgi_app, "http": get_asgi_application(),
"websocket": HeaderAuthMiddleware(URLRouter(routing.websocket_urlpatterns)), "websocket": HeaderAuthMiddleware(URLRouter(routing.websocket_urlpatterns)),
} }
) )

View File

@ -19,7 +19,6 @@ services:
- mailhog - mailhog
- elasticsearch - elasticsearch
volumes: volumes:
- /var/www/media:/app/akarpov/media
- .:/app:z - .:/app:z
env_file: env_file:
- ./.envs/.local/.django - ./.envs/.local/.django
@ -45,7 +44,7 @@ services:
- ./.envs/.local/.django - ./.envs/.local/.django
- ./.envs/.local/.postgres - ./.envs/.local/.postgres
ports: ports:
- "3025:3000" - "3000:3000"
command: /start-redirect command: /start-redirect
postgres: postgres:

1297
poetry.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -95,6 +95,8 @@ yt-dlp = "^2023.7.6"
pytube = "^15.0.0" pytube = "^15.0.0"
urllib3 = ">=1.26" urllib3 = ">=1.26"
requests = ">=2.25" requests = ">=2.25"
spacy = {extras = ["lookups"], version = "^3.6.1"}
spacy-transformers = "^1.2.5"
extract-msg = "0.28.7" extract-msg = "0.28.7"
pytest-factoryboy = "2.3.1" pytest-factoryboy = "2.3.1"
pytest-xdist = "^3.3.1" pytest-xdist = "^3.3.1"