spinta 0.2.dev26__py3-none-any.whl → 0.2.dev28__py3-none-any.whl

spinta/accesslog/__init__.py

@@ -1,22 +1,14 @@
 import datetime
 import os
 import time
-from typing import Any
-from typing import Dict
-from typing import Iterable
-from typing import Iterator
-from typing import List
-from typing import TypeVar
-from typing import AsyncIterator
-from typing import overload
+from typing import Any, AsyncIterator, Dict, Iterable, Iterator, List, TypeVar, overload
 
 import psutil
 from starlette.requests import Request
 
 from spinta import commands
 from spinta.auth import Token, get_default_auth_client_id
-from spinta.components import Context, Config
-from spinta.components import UrlParams
+from spinta.components import Config, Context, UrlParams
 
 
 class AccessLog:

spinta/accesslog/file.py

@@ -1,16 +1,13 @@
-from typing import Any
-from typing import Dict
-from typing import TextIO, Union
-
 import json
-import sys
 import pathlib
+import sys
+from typing import Any, Dict, TextIO, Union
 
 from starlette.requests import Request
 
 from spinta import commands
 from spinta.accesslog import AccessLog
-from spinta.components import Context, Config, Store
+from spinta.components import Config, Context, Store
 
 
 class FileAccessLog(AccessLog):

spinta/accesslog/python.py

@@ -1,6 +1,5 @@
-from typing import Dict, Any
-
 import json
+from typing import Any, Dict
 
 from spinta import commands
 from spinta.accesslog import AccessLog

spinta/adapters/soap_plugins.py

@@ -6,10 +6,10 @@ from pathlib import Path
 from types import ModuleType
 from typing import Any, Callable
 
-from spinta.core.ufuncs import Expr, UFuncRegistry
 from spinta.core.config import RawConfig
-from spinta.ufuncs.loadbuilder.components import LoadBuilder
+from spinta.core.ufuncs import Expr, UFuncRegistry
 from spinta.datasets.backends.dataframe.backends.soap.ufuncs.components import SoapQueryBuilder
+from spinta.ufuncs.loadbuilder.components import LoadBuilder
 
 log = logging.getLogger(__name__)
 

spinta/api/__init__.py

@@ -11,50 +11,51 @@ from starlette.datastructures import FormData
 from starlette.exceptions import HTTPException
 from starlette.middleware import Middleware
 from starlette.requests import Request
-from starlette.responses import RedirectResponse
-from starlette.responses import Response, JSONResponse
-from starlette.routing import Route, Mount
+from starlette.responses import JSONResponse, RedirectResponse, Response
+from starlette.routing import Mount, Route
 from starlette.staticfiles import StaticFiles
-from starlette.templating import Jinja2Templates
 
-from spinta import components, commands
+from spinta import commands, components
 from spinta.accesslog import create_accesslog
-from spinta.api.validators import ClientAddData, ClientPatchData, ClientSecretPatchData, ClientBackendsData
+from spinta.api.validators import ClientAddData, ClientBackendsData, ClientPatchData, ClientSecretPatchData
 from spinta.auth import (
     AuthorizationServer,
+    BearerTokenValidator,
+    KeyType,
+    ResourceProtector,
+    Scopes,
+    StarletteOAuth2Data,
+    authenticate_token,
     check_scope,
-    query_client,
-    get_clients_list,
     client_exists,
     create_client_file,
     delete_client_file,
-    update_client_file,
+    get_auth_request,
+    get_auth_token,
+    get_clients_list,
     get_clients_path,
-    Scopes,
-    authenticate_token,
-    StarletteOAuth2Data,
-    KeyType,
-    load_key_from_file,
     has_scope,
+    load_key_from_file,
+    query_client,
+    update_client_file,
 )
-from spinta.auth import BearerTokenValidator
-from spinta.auth import ResourceProtector
-from spinta.auth import get_auth_request
-from spinta.auth import get_auth_token
-from spinta.commands import prepare, get_version
+from spinta.commands import get_version, prepare
 from spinta.components import Context, UrlParams
-from spinta.exceptions import BaseError, MultipleErrors, error_response, InsufficientPermission, ClientValidationError
-from spinta.exceptions import NoAuthServer
-from spinta.middlewares import ContextMiddleware
-from spinta.urlparams import Version
-from spinta.urlparams import get_response_type
-from spinta.utils.path import resource_filename
+from spinta.exceptions import (
+    BaseError,
+    ClientValidationError,
+    InsufficientPermission,
+    MultipleErrors,
+    NoAuthServer,
+    error_response,
+)
+from spinta.formats.html.helpers import get_templates
+from spinta.middlewares import ContextMiddleware, PathNormalizationMiddleware, StrictTransportSecurityMiddleware
+from spinta.urlparams import Version, get_response_type
 
 log = logging.getLogger(__name__)
 
-templates = Jinja2Templates(
-    directory=str(resource_filename("spinta", "templates")),
-)
+templates = get_templates()
 
 
 async def favicon(request: Request):
@@ -369,7 +370,7 @@ async def error(request, exc):
     elif isinstance(exc, BaseError):
         status_code = exc.status_code
         errors = [error_response(exc)]
-        headers = exc.headers
+        headers = dict(exc.headers)
     else:
         if isinstance(exc, HTTPException):
             status_code = exc.status_code
@@ -399,6 +400,11 @@ async def error(request, exc):
 
     response = {"errors": errors}
 
+    # Error responses can reflect request input (e.g. the requested path) and
+    # must never be stored by shared caches, otherwise they can be used for
+    # web cache poisoning.
+    headers["Cache-Control"] = "no-store"
+
     fmt = get_response_type(request.state.context, request)
     if fmt == "json" or fmt is None:
         return JSONResponse(
@@ -422,6 +428,7 @@ async def error(request, exc):
 
 async def srid_check(request: Request):
     from shapely.geometry import Point
+
     from spinta.types.geometry.helpers import get_osm_link
 
     srid = request.path_params["srid"]
@@ -460,7 +467,14 @@ def init(context: Context):
         Route("/{path:path}", homepage, methods=["HEAD", "GET", "POST", "PUT", "PATCH", "DELETE"]),
     ]
 
-    middleware = [Middleware(ContextMiddleware, context=context)]
+    middleware = [
+        Middleware(
+            StrictTransportSecurityMiddleware,
+            value=config.http_strict_transport_security,
+        ),
+        Middleware(PathNormalizationMiddleware),
+        Middleware(ContextMiddleware, context=context),
+    ]
 
     exception_handlers = {
         Exception: error,

spinta/api/inspect.py

@@ -1,23 +1,22 @@
 import os
 import tempfile
+from typing import Tuple
 
-from starlette.requests import Request, FormData
 from starlette.datastructures import UploadFile
-
-from typing import Tuple
+from starlette.requests import FormData, Request
 
 from spinta import commands
-from spinta.auth import check_scope, Scopes
+from spinta.auth import Scopes, check_scope
 from spinta.components import Context, UrlParams
 from spinta.datasets.inspect.helpers import create_manifest_from_inspect
 from spinta.exceptions import (
-    UnexpectedFormKeys,
     InvalidFormKeyCombination,
-    RequiredFormKeyWithCondition,
-    MissingFormKeys,
     InvalidInputData,
+    MissingFormKeys,
+    RequiredFormKeyWithCondition,
+    UnexpectedFormKeys,
 )
-from spinta.manifests.components import ManifestPath, Manifest
+from spinta.manifests.components import Manifest, ManifestPath
 
 
 def _validate_form_data(form: FormData):

spinta/api/schema.py

@@ -6,24 +6,24 @@ from starlette.requests import Request
 from starlette.responses import JSONResponse
 
 from spinta import commands
-from spinta.auth import check_scope, Scopes
+from spinta.auth import Scopes, check_scope
 from spinta.cli.helpers.migrate import MigrationConfig
 from spinta.cli.helpers.store import prepare_manifest
-from spinta.components import Context, UrlParams, Store, Model, Config, Property
+from spinta.components import Config, Context, Model, Property, Store, UrlParams
 from spinta.core.context import configure_context, create_context
 from spinta.datasets.inspect.helpers import zipitems
 from spinta.exceptions import (
-    NotSupportedManifestType,
-    InvalidSchemaUrlPath,
-    InvalidName,
-    UnknownContentType,
-    FileSizeTooLarge,
     DatasetNameMissmatch,
     DatasetSchemaRequiresIds,
-    ModifySchemaRequiresFile,
+    FileSizeTooLarge,
+    InvalidName,
+    InvalidSchemaUrlPath,
     ModifyOneDatasetSchema,
+    ModifySchemaRequiresFile,
+    NotSupportedManifestType,
+    UnknownContentType,
 )
-from spinta.manifests.components import ManifestPath, Manifest
+from spinta.manifests.components import Manifest, ManifestPath
 from spinta.manifests.tabular.helpers import datasets_to_tabular
 from spinta.utils.naming import is_valid_namespace_name
 from spinta.utils.schema import NA

spinta/api/validators.py

@@ -1,6 +1,6 @@
-from typing import Optional, Any
+from typing import Any, Optional
 
-from pydantic import BaseModel, Field, ConfigDict
+from pydantic import BaseModel, ConfigDict, Field
 
 
 class ClientAddData(BaseModel):

spinta/asgi.py

@@ -1,6 +1,6 @@
+from spinta import commands
 from spinta.api import init
 from spinta.core.context import create_context
-from spinta import commands
 
 context = create_context("asgi")
 

spinta/auth.py

@@ -14,54 +14,48 @@ from collections import defaultdict
 from functools import cached_property
 from itertools import chain
 from threading import Lock
-from typing import Set, Any, TypedDict, Literal
-from typing import Type
-from typing import Union, List, Tuple
+from typing import Any, List, Literal, Set, Tuple, Type, TypedDict, Union
 
 import requests
 import ruamel.yaml
-from authlib.jose import JsonWebKey, RSAKey, JWTClaims
-from authlib.jose import jwt
-from authlib.jose.errors import JoseError, DecodeError, InvalidTokenError, BadSignatureError
-from authlib.oauth2 import OAuth2Error
-from authlib.oauth2 import OAuth2Request
-from authlib.oauth2 import rfc6749
-from authlib.oauth2 import rfc6750
-from authlib.oauth2.rfc6749 import grants, OAuth2Payload, list_to_scope
+from authlib.jose import JsonWebKey, JWTClaims, RSAKey, jwt
+from authlib.jose.errors import BadSignatureError, DecodeError, InvalidTokenError, JoseError
+from authlib.oauth2 import OAuth2Error, OAuth2Request, rfc6749, rfc6750
+from authlib.oauth2.rfc6749 import OAuth2Payload, grants, list_to_scope
 from authlib.oauth2.rfc6749.errors import InvalidClientError
-from authlib.oauth2.rfc6750.errors import InsufficientScopeError
 from authlib.oauth2.rfc6749.util import scope_to_list
-from cachetools import cached, LRUCache
+from authlib.oauth2.rfc6750.errors import InsufficientScopeError
+from cachetools import LRUCache, cached
 from cachetools.keys import hashkey
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric import rsa
 from multipledispatch import dispatch
 from requests import RequestException
-from starlette.datastructures import FormData, QueryParams, Headers
+from starlette.datastructures import FormData, Headers, QueryParams
 from starlette.exceptions import HTTPException
 from starlette.responses import JSONResponse
 
 from spinta import commands
-from spinta.components import Config
-from spinta.components import Context, Namespace, Model, Property
-from spinta.components import ScopeFormatterFunc
+from spinta.components import Config, Context, Model, Namespace, Property, ScopeFormatterFunc
 from spinta.core.enums import Access, Action
-from spinta.exceptions import AuthorizedClientsOnly, NoScopesForNamespaces, InvalidExtraScopes
-from spinta.exceptions import BasicAuthRequired
 from spinta.exceptions import (
-    InvalidToken,
-    NoTokenValidationKey,
-    ClientWithNameAlreadyExists,
+    AuthorizedClientsOnly,
+    BasicAuthRequired,
     ClientAlreadyExists,
-    ClientsKeymapNotFound,
     ClientsIdFolderNotFound,
+    ClientsKeymapNotFound,
+    ClientWithNameAlreadyExists,
+    InvalidClientFileFormat,
     InvalidClientsKeymapStructure,
+    InvalidExtraScopes,
     InvalidScopes,
-    InvalidClientFileFormat,
+    InvalidToken,
     ModelNotFound,
+    NoScopesForNamespaces,
+    NoTokenValidationKey,
 )
 from spinta.utils import passwords
-from spinta.utils.config import get_clients_path, get_keymap_path, get_id_path, get_helpers_path
+from spinta.utils.config import get_clients_path, get_helpers_path, get_id_path, get_keymap_path
 from spinta.utils.scopes import name_to_scope
 from spinta.utils.types import is_str_uuid
 

spinta/backends/__init__.py

@@ -6,93 +6,80 @@ import decimal
 import json
 import pathlib
 import uuid
-from typing import Any
-from typing import AsyncIterator
-from typing import Dict
-from typing import Iterable
-from typing import List
-from typing import Optional
+from typing import Any, AsyncIterator, Dict, Iterable, List, Optional
 
-from cbor2 import dumps as cbor_dumps
 import dateutil
 import shapely.geometry.base
-from geoalchemy2.elements import WKTElement, WKBElement
+from cbor2 import dumps as cbor_dumps
+from geoalchemy2.elements import WKBElement, WKTElement
 from geoalchemy2.shape import to_shape
 from shapely import wkt
 
-from spinta import commands
-from spinta import exceptions
-from spinta.backends.components import Backend
-from spinta.backends.components import SelectTree
-from spinta.backends.helpers import check_unknown_props, get_select_tree, prepare_response, is_accessible_by_equals_sign
-from spinta.backends.helpers import flat_select_to_nested
-from spinta.backends.helpers import get_model_reserved_props
-from spinta.backends.helpers import get_select_prop_names
-from spinta.backends.helpers import select_keys
-from spinta.backends.helpers import select_model_props
-from spinta.backends.helpers import select_props
-from spinta.commands import gen_object_id
-from spinta.commands import is_object_id
-from spinta.commands import load_operator_value
-from spinta.commands import prepare
-from spinta.components import Context
-from spinta.components import DataItem
-from spinta.components import Model
-from spinta.components import Namespace
-from spinta.components import Node
-from spinta.components import Property
-from spinta.components import UrlParams, page_in_data
+from spinta import commands, exceptions
+from spinta.backends.components import Backend, SelectTree
+from spinta.backends.helpers import (
+    check_unknown_props,
+    flat_select_to_nested,
+    get_model_reserved_props,
+    get_select_prop_names,
+    get_select_tree,
+    is_accessible_by_equals_sign,
+    prepare_response,
+    select_keys,
+    select_model_props,
+    select_props,
+)
+from spinta.commands import gen_object_id, is_object_id, load_operator_value, prepare
+from spinta.components import Context, DataItem, Model, Namespace, Node, Property, UrlParams, page_in_data
 from spinta.core.enums import Action
 from spinta.core.ufuncs import asttoexpr
 from spinta.exceptions import (
     ConflictingValue,
-    RequiredProperty,
-    LangNotDeclared,
-    TooManyLangsGiven,
-    UnableToDetermineRequiredLang,
     CoordinatesOutOfRange,
+    DirectRefValueUnassignment,
     InheritPropertyValueMissmatch,
-    SRIDNotSetForGeometry,
     InvalidUuidValue,
-    DirectRefValueUnassignment,
+    LangNotDeclared,
+    NoItemRevision,
+    RequiredProperty,
+    SRIDNotSetForGeometry,
+    TooManyLangsGiven,
+    UnableToDetermineRequiredLang,
 )
-from spinta.exceptions import NoItemRevision
 from spinta.formats.components import Format
 from spinta.manifests.components import Manifest
 from spinta.types.datatype import (
+    JSON,
+    UUID,
     Array,
-    ExternalRef,
-    Inherit,
-    PageType,
-    BackRef,
     ArrayBackRef,
-    Integer,
+    BackRef,
+    Base32,
+    Binary,
     Boolean,
+    DataType,
+    Date,
+    DateTime,
     Denorm,
-    Base32,
+    ExternalRef,
+    File,
+    Inherit,
+    Integer,
+    Number,
+    Object,
+    PageType,
+    PrimaryKey,
+    Ref,
     String,
+    Time,
 )
-from spinta.types.datatype import Binary
-from spinta.types.datatype import DataType
-from spinta.types.datatype import Date
-from spinta.types.datatype import DateTime
-from spinta.types.datatype import File
-from spinta.types.datatype import JSON
-from spinta.types.datatype import Number
-from spinta.types.datatype import Object
-from spinta.types.datatype import PrimaryKey
-from spinta.types.datatype import Ref
-from spinta.types.datatype import String
-from spinta.types.datatype import Time
-from spinta.types.datatype import UUID
 from spinta.types.geometry.components import Geometry
 from spinta.types.geometry.helpers import get_crs_bounding_area
 from spinta.types.text.components import Text
-from spinta.utils.types import is_nan
 from spinta.utils.config import asbool
 from spinta.utils.encoding import encode_page_values
-from spinta.utils.schema import NA
-from spinta.utils.schema import NotAvailable
+from spinta.utils.schema import NA, NotAvailable
+from spinta.utils.types import is_nan
 
 
 @commands.prepare_for_write.register(Context, Model, Backend, dict)

spinta/backends/components.py

@@ -2,12 +2,9 @@ from __future__ import annotations
 
 import contextlib
 import dataclasses
-from typing import Any, Type
-from typing import Dict
-from typing import Optional
-from typing import Set
+from typing import Any, Dict, Optional, Set, Type
 
-from spinta.backends.constants import BackendOrigin, BackendFeatures, DistributionType
+from spinta.backends.constants import BackendFeatures, BackendOrigin, DistributionType
 from spinta.core.ufuncs import Env
 from spinta.ufuncs.resultbuilder.components import ResultBuilder
 

spinta/backends/fs/commands/bootstrap.py

@@ -1,6 +1,6 @@
 from spinta import commands
-from spinta.components import Context
 from spinta.backends.fs.components import FileSystem
+from spinta.components import Context
 
 
 @commands.bootstrap.register(Context, FileSystem)

spinta/backends/fs/commands/changes.py

@@ -1,8 +1,8 @@
 from typing import AsyncIterator
 
 from spinta import commands
-from spinta.components import Context, Property, DataItem
 from spinta.backends.fs.components import FileSystem
+from spinta.components import Context, DataItem, Property
 
 
 @commands.create_changelog_entry.register(Context, Property, FileSystem)

spinta/backends/fs/commands/decode.py

@@ -1,10 +1,10 @@
 import pathlib
 
 from spinta import commands
+from spinta.backends.fs.components import FileSystem
 from spinta.components import Context
-from spinta.types.datatype import File
 from spinta.formats.components import Format
-from spinta.backends.fs.components import FileSystem
+from spinta.types.datatype import File
 
 
 @commands.decode.register(Context, Format, FileSystem, File, dict)

spinta/backends/fs/commands/encode.py

@@ -3,7 +3,7 @@ from typing import Optional, Union
 from spinta import commands
 from spinta.components import Context
 from spinta.types.datatype import File
-from spinta.utils.schema import NotAvailable, NA
+from spinta.utils.schema import NA, NotAvailable
 
 
 @commands.build_data_patch_for_write.register(Context, File)

spinta/backends/fs/commands/init.py

@@ -1,9 +1,9 @@
 from spinta import commands
-from spinta.components import Context, Attachment
-from spinta.manifests.components import Manifest
 from spinta.backends.components import Backend
-from spinta.types.datatype import File
 from spinta.backends.fs.components import FileSystem
+from spinta.components import Attachment, Context
+from spinta.manifests.components import Manifest
+from spinta.types.datatype import File
 
 
 @commands.prepare.register(Context, FileSystem, Manifest)

spinta/backends/fs/commands/load.py

@@ -1,9 +1,9 @@
 import pathlib
-from typing import Dict, Any
+from typing import Any, Dict
 
 from spinta import commands
-from spinta.components import Context
 from spinta.backends.fs.components import FileSystem
+from spinta.components import Context
 
 
 @commands.load.register(Context, FileSystem, dict)

spinta/backends/fs/commands/migrate.py

@@ -1,7 +1,7 @@
 from spinta import commands
+from spinta.backends.fs.components import FileSystem
 from spinta.components import Context
 from spinta.manifests.components import Manifest
-from spinta.backends.fs.components import FileSystem
 
 
 @commands.migrate.register(Context, Manifest, FileSystem)

spinta/backends/fs/commands/read.py

@@ -1,15 +1,12 @@
-from typing import Optional
-from typing import overload
 from pathlib import Path
+from typing import Optional, overload
 
-from spinta.typing import ObjectData
-from spinta.typing import FileObjectData
 from spinta import commands
-from spinta.components import Context
-from spinta.components import Property
 from spinta.backends.fs.components import FileSystem
-from spinta.types.datatype import DataType, File
+from spinta.components import Context, Property
 from spinta.exceptions import ItemDoesNotExist
+from spinta.types.datatype import DataType, File
+from spinta.typing import FileObjectData, ObjectData
 
 
 @overload

spinta/backends/fs/commands/validate.py

@@ -1,13 +1,13 @@
 import os
-
 from pathlib import Path
+
 from spinta import commands
-from spinta.components import Context, Property, DataItem
-from spinta.core.enums import Action
 from spinta.backends.components import Backend
-from spinta.types.datatype import DataType, File
 from spinta.backends.fs.components import FileSystem
-from spinta.exceptions import FileNotFound, ConflictingValue, UnacceptableFileName
+from spinta.components import Context, DataItem, Property
+from spinta.core.enums import Action
+from spinta.exceptions import ConflictingValue, FileNotFound, UnacceptableFileName
+from spinta.types.datatype import DataType, File
 
 
 @commands.simple_data_check.register(Context, DataItem, File, Property, FileSystem, dict)

spinta/backends/fs/commands/wait.py

@@ -1,6 +1,6 @@
 from spinta import commands
-from spinta.components import Context
 from spinta.backends.fs.components import FileSystem
+from spinta.components import Context
 
 
 @commands.wait.register(Context, FileSystem)

spinta/backends/fs/commands/wipe.py

@@ -1,7 +1,7 @@
 from spinta import commands
+from spinta.backends.fs.components import FileSystem
 from spinta.commands import getall
 from spinta.components import Context
-from spinta.backends.fs.components import FileSystem
 from spinta.types.datatype import File
 from spinta.utils.data import take