kirillgashkov
diff --git a/‎backend/README.md
Lines changed: 18 additions & 35 deletions b/‎backend/README.md
Lines changed: 18 additions & 35 deletions
diff --git a/‎backend/example.env
Lines changed: 4 additions & 4 deletions b/‎backend/example.env
Lines changed: 4 additions & 4 deletions
diff --git a/‎backend/pyproject.toml
Lines changed: 1 addition & 0 deletions b/‎backend/pyproject.toml
Lines changed: 1 addition & 0 deletions
@@ -1,48 +1,30 @@
 # Yama
 
-The backend server is a FastAPI application with a modular architecture inspired
-by Netflix's [dispatch](https://github.com/Netflix/dispatch). Each module has a
-consistent and straightforward structure:
-
-- `routes.py` for FastAPI routes.
-- `dependencies.py` for FastAPI dependencies.
-- `utils.py` for *utility* functions (also collectively known as a service,
-  these shouldn't be confused with helper functions, these are functions with
-  exposed module-specific business logic that can be used by other modules).
-- `models.py` for SQLAlchemy and Pydantic models.
-- `settings.py` for settings.
-
-<blockquote>
-<details>
-  <summary>Why <code>utils.py</code> and not <code>service.py</code>?</summary>
-
-  Taste. And a bit of inspiration by
-  <a href="https://tailwindcss.com/">Tailwind's</a> usage of the word "utility".
-  Besides, generally it's not a good idea to have random <code>utils.py</code>
-  with generic helper functions all over your project anyways.
-</details>
-</blockquote>
+The backend server is a FastAPI application with modular architecture inspired
+by Go.
 
 Noteworthy modules:
 
 - [`api`](yama/api) is responsible for the FastAPI application itself.
 
   It collects routes from other modules and manages application's lifetime
-  dependencies, such as the database engine and module settings. 
+  dependencies, such as the database engine and module configuration.
 
 - [`database`](yama/database) provides other modules with database connections.
 
-- [`database/provision`](yama/database/provision) provisions the Postgres database.
+- [`database/provision`](yama/database/provision) provisions the Postgres
+  database.
 
-  It uses [golang-migrate](https://github.com/golang-migrate/migrate) for database migrations.
+  It uses [golang-migrate](https://github.com/golang-migrate/migrate) for
+  database migrations.
 
-- [`user`](yama/user) manages users.
-
-- [`user/auth`](yama/user/auth) provides user authorization based on OAuth2.
+- [`auth`](yama/auth) provides user authorization based on OAuth2.
 
   It supports password and refresh token grants and has an ability to revoke an
   issued refresh token.
 
+- [`user`](yama/user) manages users.
+
 - [`file`](yama/file) manages a virtual file system for notes.
 
   The system is implemented from scratch and optimized for read operations. It
@@ -56,15 +38,16 @@ Noteworthy modules:
 
   A function is a (potentially) external program that operates on Markdown
   files. The external program could be vulnerable and untrusted, and so are the
-  Markdown files. To get out of this pickle the functions are executed in a safe
-  environment using Docker to keep them isolated from the application.
+  Markdown files. To get out of this pickle the functions are executed in a
+  safe environment using Docker to keep them isolated from the application.
+
+  The module provides 2 functions: import and export. These functions are
+  implemented as separate modules and made available via the API.
 
-- [`function/import_`](yama/function/import_) implements the import function
-  that accepts a Microsoft Word document and converts it to Markdown using
-  [Pandoc](https://pandoc.org/).
+- [`import_`](yama/import_) takes a Microsoft Word document and converts it to
+  Markdown using [Pandoc](https://pandoc.org/).
 
-- [`function/export`](yama/function/export) implements the export function that
-  accepts a Markdown document and converts it to PDF using
+- [`export`](yama/export) takes a Markdown document and converts it to PDF using
   [Pandoc](https://pandoc.org/) and [LaTeX](https://www.latex-project.org/).
 
 ## Installation and Running
 
@@ -14,10 +14,10 @@ YAMA__API__HOST=localhost
 YAMA__API__PORT=8000
 YAMA__API__RELOAD=true
 YAMA__USER__PUBLIC_USER_ID=00000000-0000-0000-0000-000000000000
-YAMA__USER__AUTH__ACCESS_TOKEN__KEY=abc
-YAMA__USER__AUTH__ACCESS_TOKEN__EXPIRE_SECONDS=1800
-YAMA__USER__AUTH__REFRESH_TOKEN__KEY=xyz
-YAMA__USER__AUTH__REFRESH_TOKEN__EXPIRE_SECONDS=604800
+YAMA__AUTH__ACCESS_TOKEN__KEY=abc
+YAMA__AUTH__ACCESS_TOKEN__EXPIRE_SECONDS=1800
+YAMA__AUTH__REFRESH_TOKEN__KEY=xyz
+YAMA__AUTH__REFRESH_TOKEN__EXPIRE_SECONDS=604800
 YAMA__FILE__FILES_BASE_URL=http://localhost:8000/files
 YAMA__FILE__ROOT_FILE_ID=00000000-0000-0000-0000-111111111111
 YAMA__FILE__DRIVER__TYPE=file-system
 
@@ -17,6 +17,7 @@ dependencies = [
     "aiofiles",
     "argon2-cffi",
     "python-jose[cryptography]",
+    "aiohttp[speedups]",
 ]
 optional-dependencies.dev = [
     "anyio",
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ dependencies = [`
`17`	`17`	`"aiofiles",`
`18`	`18`	`"argon2-cffi",`
`19`	`19`	`"python-jose[cryptography]",`
	`20`	`+ "aiohttp[speedups]",`
`20`	`21`	`]`
`21`	`22`	`optional-dependencies.dev = [`
`22`	`23`	`"anyio",`