datajunction-server 0.0.1a63__tar.gz → 0.0.1a63.dev0__tar.gz

{datajunction_server-0.0.1a63 → datajunction_server-0.0.1a63.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datajunction-server
-Version: 0.0.1a63
+Version: 0.0.1a63.dev0
 Summary: DataJunction server library for running to a DataJunction server
 Project-URL: repository, https://github.com/DataJunction/dj
 Author-email: DataJunction Authors <yian.shang@gmail.com>

datajunction_server-0.0.1a63.dev0/datajunction_server/__about__.py

@@ -0,0 +1,4 @@
+"""
+Version for Hatch
+"""
+__version__ = "0.0.1a63.dev0"

{datajunction_server-0.0.1a63 → datajunction_server-0.0.1a63.dev0}/datajunction_server/api/data.py

@@ -429,7 +429,7 @@ async def get_data_stream_for_metrics(  # pylint: disable=R0914, R0913
     engine_version: Optional[str] = None,
 ) -> QueryWithResults:
     """
-    Return data for a set of metrics with dimensions and filters using server side events
+    Return data for a set of metrics with dimensions and filters using server sent events
     """
     request_headers = dict(request.headers)
     translated_sql, engine, catalog = await build_sql_for_multiple_metrics(

{datajunction_server-0.0.1a63 → datajunction_server-0.0.1a63.dev0}/datajunction_server/database/user.py

@@ -1,7 +1,8 @@
 """User database schema."""
 from typing import TYPE_CHECKING, Optional
 
-from sqlalchemy import BigInteger, Enum, Integer, String
+from sqlalchemy import BigInteger, Enum, Integer, String, select
+from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from datajunction_server.database.base import Base
@@ -63,3 +64,16 @@ class User(Base):  # pylint: disable=too-few-public-methods
         foreign_keys="Tag.created_by_id",
         lazy="joined",
     )
+
+    @classmethod
+    async def get_by_username(
+        cls,
+        session: AsyncSession,
+        username: str,
+    ) -> Optional["User"]:
+        """
+        Find a user by username
+        """
+        statement = select(User).where(User.username == username)
+        result = await session.execute(statement)
+        return result.unique().scalar_one_or_none()

{datajunction_server-0.0.1a63 → datajunction_server-0.0.1a63.dev0}/datajunction_server/utils.py

@@ -289,7 +289,8 @@ async def get_and_update_current_user(
     )
     await session.execute(statement)
     await session.commit()
-    return current_user
+    refreshed_user = await User.get_by_username(session, current_user.username)
+    return refreshed_user  # type: ignore
 
 
 SEPARATOR = "."

datajunction_server-0.0.1a63/datajunction_server/__about__.py

@@ -1,4 +0,0 @@
-"""
-Version for Hatch
-"""
-__version__ = "0.0.1a63"