navigator-session 0.6.2__tar.gz → 0.8.0__tar.gz

navigator_session-0.8.0/Makefile

@@ -0,0 +1,85 @@
+# Navigator-Session Makefile
+
+.PHONY: venv install develop release format lint test clean distclean lock sync
+
+# Python version to use
+PYTHON_VERSION := 3.11
+
+# Auto-detect available tools
+HAS_UV := $(shell command -v uv 2> /dev/null)
+
+# Install uv if missing
+install-uv:
+	curl -LsSf https://astral.sh/uv/install.sh | sh
+	@echo "uv installed! You may need to restart your shell or run 'source ~/.bashrc'"
+
+# Create virtual environment
+venv:
+	uv venv --python $(PYTHON_VERSION) .venv
+	@echo 'run `source .venv/bin/activate` to start develop Navigator-Session'
+
+# Install production dependencies using lock file
+install:
+	uv sync --frozen --no-dev
+	@echo "Production dependencies installed."
+
+# Generate lock files
+lock:
+ifdef HAS_UV
+	uv lock
+else
+	@echo "Lock files require uv. Install with: make install-uv"
+endif
+
+# Install all dependencies including dev dependencies
+develop:
+	uv sync --frozen --dev
+
+# Alternative: install without lock file (faster for development)
+develop-fast:
+	uv pip install -e .
+	uv pip install -e .[dev]
+
+# Build and publish release
+release: lint test clean
+	uv build
+	uv publish
+
+# Format code
+format:
+	uv run black navigator_session
+
+# Lint code
+lint:
+	uv run pylint --rcfile .pylintrc navigator_session/*.py
+	uv run black --check navigator_session
+
+# Run tests
+test:
+	uv run coverage run -m pytest tests
+	uv run coverage report
+	uv run mypy navigator_session/*.py
+
+# Performance tests
+perf:
+	uv run python -m unittest -v navigator_session.tests.perf
+
+# Clean build artifacts
+clean:
+	rm -rf build/
+	rm -rf dist/
+	rm -rf *.egg-info/
+	find . -name "*.pyc" -delete
+	find . -name "*.pyo" -delete
+	find . -name "*.so" -delete
+	find . -type d -name __pycache__ -delete
+	@echo "Clean complete."
+
+# Remove virtual environment
+distclean:
+	rm -rf .venv
+	rm -rf uv.lock
+
+# Show project info
+info:
+	uv tree

{navigator_session-0.6.2 → navigator_session-0.8.0}/PKG-INFO

@@ -1,18 +1,16 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: navigator-session
-Version: 0.6.2
+Version: 0.8.0
 Summary: Navigator Session allows us to store user-specific data into session object.
-Home-page: https://github.com/phenobarbital/navigator-session
-Author: Jesus Lara
-Author-email: jesuslarag@gmail.com
-License: Apache-2.0
+Author-email: Jesus Lara Gimenez <jesuslarag@gmail.com>
+License-Expression: Apache-2.0
+Project-URL: Homepage, https://github.com/phenobarbital/navigator-session
 Project-URL: Source, https://github.com/phenobarbital/navigator-session
 Project-URL: Funding, https://paypal.me/phenobarbital
-Project-URL: Say Thanks!, https://saythanks.io/to/phenobarbital
-Keywords: asyncio,session,aioredis,aiohttp
-Platform: POSIX
+Project-URL: Documentation, https://github.com/phenobarbital/navigator-session
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: System Administrators
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Environment :: Web Environment
 Classifier: Topic :: Software Development :: Build Tools
@@ -31,8 +29,9 @@ Requires-Dist: aiohttp>=3.9.5
 Requires-Dist: asyncio==3.4.3
 Requires-Dist: jsonpickle>=3.0.2
 Requires-Dist: redis>=5.0.4
-Requires-Dist: python_datamodel>=0.7.0
+Requires-Dist: python-datamodel>=0.7.0
 Requires-Dist: navconfig[default]>=1.7.0
+Dynamic: license-file
 
 # Navigator_Session #
 

{navigator_session-0.6.2 → navigator_session-0.8.0}/navigator_session/data.py

@@ -1,9 +1,8 @@
 import uuid
 import time
 from typing import Union, Optional, Any
-from datetime import datetime
+from datetime import datetime, timezone
 from collections.abc import Iterator, Mapping, MutableMapping
-import pendulum
 import jsonpickle
 from jsonpickle.unpickler import loadclass
 from aiohttp import web
@@ -13,6 +12,11 @@ from .conf import (
     SESSION_ID,
     SESSION_STORAGE
 )
+try:
+    from pydantic import BaseModel as PydanticBaseModel
+except ImportError:
+    PydanticBaseModel = None
+
 
 class ModelHandler(jsonpickle.handlers.BaseHandler):
     """ModelHandler.
@@ -25,16 +29,31 @@ class ModelHandler(jsonpickle.handlers.BaseHandler):
     def restore(self, obj):
         module_and_type = obj['py/object']
         mdl = loadclass(module_and_type)
-        if hasattr(mdl, '__new__'):
-            cls = mdl.__new__(mdl)
-        else:
-            cls = object.__new__(mdl)
-
+        cls = mdl.__new__(mdl) if hasattr(mdl, '__new__') else object.__new__(mdl)
         cls.__dict__ = self.context.restore(obj['__dict__'], reset=False)
         return cls
 
 jsonpickle.handlers.registry.register(BaseModel, ModelHandler, base=True)
 
+if PydanticBaseModel:
+    class PydanticHandler(jsonpickle.handlers.BaseHandler):
+        """PydanticHandler.
+        This class can handle with serializable Pydantic Models.
+        """
+        def flatten(self, obj, data):
+            data['__dict__'] = self.context.flatten(obj.__dict__, reset=False)
+            return data
+
+        def restore(self, obj):
+            module_and_type = obj['py/object']
+            mdl = loadclass(module_and_type)
+            cls = mdl.__new__(mdl) if hasattr(mdl, '__new__') else object.__new__(mdl)
+            cls.__dict__ = self.context.restore(obj['__dict__'], reset=False)
+            return cls
+
+    jsonpickle.handlers.registry.register(PydanticBaseModel, PydanticHandler, base=True)
+
+
 class SessionData(MutableMapping[str, Any]):
     """Session dict-like object.
     """
@@ -53,33 +72,29 @@ class SessionData(MutableMapping[str, Any]):
         self._changed = False
         self._data = {}
         # Unique ID:
-        self._id_ = data.get(SESSION_ID, None) if data else id
-        if not self._id_:
-            self._id_ = uuid.uuid4().hex
+        self._id_ = (data.get(SESSION_ID, None) if data else id) or uuid.uuid4().hex
         # Session Identity
-        self._identity = data.get(SESSION_KEY, None) if data else identity
-        if not self._identity:
-            self._identity = self._id_
+        self._identity = (
+            data.get(SESSION_KEY, None) if data else identity
+        ) or self._id_
         self._new = new if data != {} else True
-        self._max_age = max_age if max_age else None
+        self._max_age = max_age or None
         created = data.get('created', None) if data else None
-        self._now = pendulum.now('UTC')  # time for this instance creation
+        self._now = datetime.now(timezone.utc)
         self.__created__ = self._now
-        now = int(self._now.int_timestamp)
+        now = int(self._now.timestamp())
         self._now = now  # time for this instance creation
         age = now - created if created else now
         if max_age is not None and age > max_age:
             data = None
-        if self._new or created is None:
-            self._created = now
-        else:
-            self._created = created
+        self._created = now if self._new or created is None else created
         ## Data updating.
         if data is not None:
             self._data.update(data)
         # Other mark timestamp for this session:
-        dt = pendulum.now('UTC')
-        self._dow = dt.day_of_week
+        dt = datetime.now(timezone.utc)
+        self._dow = dt.weekday()
+        self._doy = dt.timetuple().tm_yday
         self._time = dt.time()
         self.args = args
 

{navigator_session-0.6.2 → navigator_session-0.8.0}/navigator_session/storages/redis.py

@@ -249,7 +249,7 @@ class RedisStorage(AbstractStorage):
     ) -> SessionData:
         """Create a New Session Object for this User."""
         session_identity = request.get(SESSION_KEY, None)
-        session_id = request.get(SESSION_ID, None)
+        session_id = data.get(SESSION_ID, request.get(SESSION_ID, None))
         try:
             conn = aioredis.Redis(connection_pool=self._redis)
         except Exception as err:

{navigator_session-0.6.2 → navigator_session-0.8.0}/navigator_session/version.py

@@ -1,11 +1,13 @@
 """Navigator Session Meta information.
    Navigator Session allows us to store user-specific data into session object.
 """
-
 __title__ = 'navigator_session'
-__description__ = ('Navigator Session allows us to store user-specific data '
-                   'into session object.')
-__version__ = '0.6.2'
+__description__ = (
+   'Navigator Session allows us to store user-specific data '
+   'into session object.'
+)
+__version__ = '0.8.0'
+__copyright__ = 'Copyright (c) 2023 Jesus Lara'
 __author__ = 'Jesus Lara'
 __author_email__ = 'jesuslarag@gmail.com'
 __license__ = 'Apache-2.0'

{navigator_session-0.6.2 → navigator_session-0.8.0}/navigator_session.egg-info/PKG-INFO

@@ -1,18 +1,16 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: navigator-session
-Version: 0.6.2
+Version: 0.8.0
 Summary: Navigator Session allows us to store user-specific data into session object.
-Home-page: https://github.com/phenobarbital/navigator-session
-Author: Jesus Lara
-Author-email: jesuslarag@gmail.com
-License: Apache-2.0
+Author-email: Jesus Lara Gimenez <jesuslarag@gmail.com>
+License-Expression: Apache-2.0
+Project-URL: Homepage, https://github.com/phenobarbital/navigator-session
 Project-URL: Source, https://github.com/phenobarbital/navigator-session
 Project-URL: Funding, https://paypal.me/phenobarbital
-Project-URL: Say Thanks!, https://saythanks.io/to/phenobarbital
-Keywords: asyncio,session,aioredis,aiohttp
-Platform: POSIX
+Project-URL: Documentation, https://github.com/phenobarbital/navigator-session
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: System Administrators
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Environment :: Web Environment
 Classifier: Topic :: Software Development :: Build Tools
@@ -31,8 +29,9 @@ Requires-Dist: aiohttp>=3.9.5
 Requires-Dist: asyncio==3.4.3
 Requires-Dist: jsonpickle>=3.0.2
 Requires-Dist: redis>=5.0.4
-Requires-Dist: python_datamodel>=0.7.0
+Requires-Dist: python-datamodel>=0.7.0
 Requires-Dist: navconfig[default]>=1.7.0
+Dynamic: license-file
 
 # Navigator_Session #
 

{navigator_session-0.6.2 → navigator_session-0.8.0}/navigator_session.egg-info/requires.txt

@@ -2,5 +2,5 @@ aiohttp>=3.9.5
 asyncio==3.4.3
 jsonpickle>=3.0.2
 redis>=5.0.4
-python_datamodel>=0.7.0
+python-datamodel>=0.7.0
 navconfig[default]>=1.7.0

navigator_session-0.8.0/pyproject.toml

@@ -0,0 +1,98 @@
+requires = [
+  'setuptools>=74.0.0',
+  'Cython>=3.0.11',
+  'wheel>=0.44.0'
+]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "navigator-session"
+dynamic = ["version"]
+description = "Navigator Session allows us to store user-specific data into session object."
+readme = "README.md"
+requires-python = ">=3.9.13"
+license = "Apache-2.0"
+authors = [
+    { name = "Jesus Lara Gimenez", email = "jesuslarag@gmail.com" }
+]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "Intended Audience :: System Administrators",
+    "Operating System :: POSIX :: Linux",
+    "Environment :: Web Environment",
+    "Topic :: Software Development :: Build Tools",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Topic :: Database :: Front-Ends",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Framework :: AsyncIO",
+    "Framework :: aiohttp",
+]
+dependencies = [
+    "aiohttp>=3.9.5",
+    "asyncio==3.4.3",
+    "jsonpickle>=3.0.2",
+    "redis>=5.0.4",
+    "python-datamodel>=0.7.0",
+    "navconfig[default]>=1.7.0",
+]
+
+[dependency-groups]
+dev = [
+    "pytest",
+    "pytest-asyncio",
+    "pytest-cov",
+    "coverage",
+    "mypy",
+    "pylint",
+    "black",
+    "flake8"
+]
+
+[project.urls]
+Homepage = "https://github.com/phenobarbital/navigator-session"
+Source = "https://github.com/phenobarbital/navigator-session"
+Funding = "https://paypal.me/phenobarbital"
+Documentation = "https://github.com/phenobarbital/navigator-session"
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["navigator_session*"]
+exclude = ["tests*", "docs*", "examples*"]
+
+[tool.setuptools.dynamic]
+version = {attr = "navigator_session.version.__version__"}
+
+[tool.pytest.ini_options]
+addopts = [
+  "--strict-config",
+  "--strict-markers",
+]
+log_cli = true
+log_cli_level = "DEBUG"
+log_cli_format = "%(asctime)s [%(levelname)8s] %(message)s (%(filename)s:%(lineno)s)"
+log_cli_date_format = "%Y-%m-%d %H:%M:%S"
+filterwarnings = [
+    "error",
+    'ignore:The loop argument is deprecated since Python 3\.8, and scheduled for removal in Python 3\.10:DeprecationWarning:asyncio',
+]
+
+[tool.black]
+line-length = 88
+include = '\.pyi?$'
+exclude = '''
+/(
+    \.git
+  | \.hg
+  | \.mypy_cache
+  | \.tox
+  | \.venv
+  | _build
+  | buck-out
+  | build
+  | dist
+)/
+'''

navigator_session-0.8.0/setup.py

@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+"""Minimal setup.py shim."""
+
+from setuptools import setup
+
+if __name__ == "__main__":
+    setup()

navigator_session-0.6.2/Makefile

@@ -1,33 +0,0 @@
-venv:
-	python3.11 -m venv .venv
-	echo 'run `source .venv/bin/activate` to start develop Navigator-Session'
-
-install:
-	pip install -e .
-
-develop:
-	pip install -e .
-	pip install -Ur docs/requirements-dev.txt
-	flit install --symlink
-
-release:
-	lint test clean
-	flit publish
-
-format:
-	python -m black navigator_session
-
-lint:
-	python -m pylint --rcfile .pylintrc navigator_session/*.py
-	python -m black --check navigator_session
-
-test:
-	python -m coverage run -m navigator_session.tests
-	python -m coverage report
-	python -m mypy navigator_session/*.py
-
-perf:
-	python -m unittest -v navigator_session.tests.perf
-
-distclean:
-	rm -rf .venv

navigator_session-0.6.2/pyproject.toml

@@ -1,67 +0,0 @@
-[build-system]
-requires = [
-  'setuptools==74.0.0',
-  'Cython==3.0.11',
-  'wheel==0.44.0'
-]
-
-build-backend = "setuptools.build_meta"
-
-[tool.flit.metadata]
-module = "navigator_session"
-author = "Jesus Lara Gimenez"
-author-email = "jesuslarag@gmail.com"
-home-page = "https://github.com/phenobarbital/navigator-session"
-classifiers=[
-  "Development Status :: 4 - Beta",
-  "Intended Audience :: Developers",
-  "Intended Audience :: System Administrators",
-  "Operating System :: OS Independent",
-  "Programming Language :: Python :: 3.9",
-  "Programming Language :: Python :: 3.10",
-  "Programming Language :: Python :: 3.11",
-  "Programming Language :: Python :: 3.12",
-  "Programming Language :: Python",
-  "Typing :: Typed",
-  "Environment :: Web Environment",
-  "Framework :: AsyncIO",
-  "Topic :: Software Development :: Libraries :: Application Frameworks",
-  "Topic :: Software Development :: Libraries :: Python Modules",
-  "Topic :: Software Development :: Build Tools",
-  "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
-  "Topic :: Internet :: WWW/HTTP",
-  "License :: OSI Approved :: BSD License",
-]
-description-file = "README.md"
-requires-python = ">=3.9.13"
-
-[tool.pytest.ini_options]
-addopts = [
-  "--strict-config",
-  "--strict-markers",
-]
-log_cli = true
-log_cli_level = "DEBUG"
-log_cli_format = "%(asctime)s [%(levelname)8s] %(message)s (%(filename)s:%(lineno)s)"
-log_cli_date_format = "%Y-%m-%d %H:%M:%S"
-filterwarnings = [
-    "error",
-    'ignore:The loop argument is deprecated since Python 3\.8, and scheduled for removal in Python 3\.10:DeprecationWarning:asyncio',
-]
-
-[tool.black]
-line-length = 88
-include = '\.pyi?$'
-exclude = '''
-/(
-    \.git
-  | \.hg
-  | \.mypy_cache
-  | \.tox
-  | \.venv
-  | _build
-  | buck-out
-  | build
-  | dist
-)/
-'''

navigator_session-0.6.2/setup.py

@@ -1,101 +0,0 @@
-#!/usr/bin/env python
-"""Navigator-Session.
-
-    Asynchronous library for managing user-specific data into a session object,
-    used by Navigator.
-See:
-https://github.com/phenobarbital/navigator-session
-"""
-import ast
-from os import path
-from setuptools import find_packages, setup
-
-
-def get_path(filename):
-    return path.join(path.dirname(path.abspath(__file__)), filename)
-
-
-def readme():
-    with open(get_path('README.md'), 'r', encoding='utf-8') as rd:
-        return rd.read()
-
-
-version = get_path('navigator_session/version.py')
-with open(version, 'r', encoding='utf-8') as meta:
-    # exec(meta.read())
-    t = compile(meta.read(), version, 'exec', ast.PyCF_ONLY_AST)
-    for node in (n for n in t.body if isinstance(n, ast.Assign)):
-        if len(node.targets) == 1:
-            name = node.targets[0]
-            if isinstance(name, ast.Name) and \
-                    name.id in (
-                        '__version__',
-                        '__title__',
-                        '__description__',
-                        '__author__',
-                        '__license__',
-                        '__author_email__'
-            ):
-                v = node.value
-                if name.id == '__version__':
-                    __version__ = v.s
-                if name.id == '__title__':
-                    __title__ = v.s
-                if name.id == '__description__':
-                    __description__ = v.s
-                if name.id == '__license__':
-                    __license__ = v.s
-                if name.id == '__author__':
-                    __author__ = v.s
-                if name.id == '__author_email__':
-                    __author_email__ = v.s
-
-
-setup(
-    name="navigator-session",
-    version=__version__,
-    python_requires=">=3.9.13",
-    url="https://github.com/phenobarbital/navigator-session",
-    description=__description__,
-    keywords=['asyncio', 'session', 'aioredis', 'aiohttp'],
-    platforms=['POSIX'],
-    long_description=readme(),
-    long_description_content_type='text/markdown',
-    classifiers=[
-        "Development Status :: 4 - Beta",
-        "Intended Audience :: Developers",
-        "Operating System :: POSIX :: Linux",
-        "Environment :: Web Environment",
-        "Topic :: Software Development :: Build Tools",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-        "Topic :: Database :: Front-Ends",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
-        "Framework :: AsyncIO",
-        "Framework :: aiohttp",
-    ],
-    author=__author__,
-    author_email=__author_email__,
-    packages=find_packages(exclude=["contrib", "docs", "tests"]),
-    license=__license__,
-    setup_requires=[
-        'setuptools==74.0.0',
-        'Cython==3.0.11',
-        'wheel==0.44.0'
-    ],
-    install_requires=[
-        "aiohttp>=3.9.5",
-        "asyncio==3.4.3",
-        "jsonpickle>=3.0.2",
-        "redis>=5.0.4",
-        "python_datamodel>=0.7.0",
-        "navconfig[default]>=1.7.0",
-    ],
-    project_urls={  # Optional
-        "Source": "https://github.com/phenobarbital/navigator-session",
-        "Funding": "https://paypal.me/phenobarbital",
-        "Say Thanks!": "https://saythanks.io/to/phenobarbital",
-    },
-)