sqladmin 0.9.0__tar.gz → 0.10.0__tar.gz

{sqladmin-0.9.0 → sqladmin-0.10.0}/.gitignore

@@ -11,3 +11,4 @@ htmlcov/
 coverage.xml
 examples/
 .vscode/
+.uploads

{sqladmin-0.9.0 → sqladmin-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqladmin
-Version: 0.9.0
+Version: 0.10.0
 Summary: SQLAlchemy admin for FastAPI and Starlette
 Project-URL: Documentation, https://aminalaee.dev/sqladmin
 Project-URL: Issues, https://github.com/aminalaee/sqladmin/issues

{sqladmin-0.9.0 → sqladmin-0.10.0}/pyproject.toml

@@ -70,7 +70,8 @@ dependencies = [
   "psycopg2-binary==2.9.5",
   "pytest==7.2.0",
   "python-dateutil==2.8.2",
-  "sqlalchemy_utils==0.38.3", 
+  "sqlalchemy_utils==0.38.3",
+  "sqlalchemy-fields",
 ]
 
 [tool.hatch.envs.lint]
@@ -119,9 +120,9 @@ sqlalchemy = ["1.4", "2.0"]
 
 [tool.hatch.envs.test.overrides]
 matrix.sqlalchemy.dependencies = [
-  { value = "sqlalchemy~=1.4", if = ["1.4"] },
+  { value = "sqlalchemy==1.4.41", if = ["1.4"] },
   { value = "sqlmodel==0.0.8", if = ["1.4"] },
-  { value = "sqlalchemy~=2.0", if = ["2.0"] },
+  { value = "sqlalchemy==2.0", if = ["2.0"] },
 ]
 
 [tool.mypy]

{sqladmin-0.9.0 → sqladmin-0.10.0}/sqladmin/__init__.py

@@ -1,7 +1,7 @@
 from sqladmin.application import Admin, expose
 from sqladmin.models import BaseView, ModelAdmin, ModelView
 
-__version__ = "0.9.0"
+__version__ = "0.10.0"
 
 __all__ = [
     "Admin",

{sqladmin-0.9.0 → sqladmin-0.10.0}/sqladmin/_queries.py

@@ -45,7 +45,12 @@ class Query:
 
             if not value:
                 # Set falsy values to None, if column is Nullable
-                if not relation and column.nullable and value is not False:
+                if (
+                    not relation
+                    and column.nullable
+                    and isinstance(value, bool)
+                    and value is not False
+                ):
                     value = None
 
                 setattr(obj, key, value)
@@ -78,7 +83,12 @@ class Query:
 
             if not value:
                 # Set falsy values to None, if column is Nullable
-                if not relation and column.nullable and value is not False:
+                if (
+                    not relation
+                    and column.nullable
+                    and isinstance(value, bool)
+                    and value is not False
+                ):
                     value = None
 
                 setattr(obj, key, value)

{sqladmin-0.9.0 → sqladmin-0.10.0}/sqladmin/application.py

@@ -1,12 +1,22 @@
 import inspect
-from typing import Any, Callable, List, Optional, Sequence, Type, Union, no_type_check
+from typing import (
+    Any,
+    Callable,
+    Dict,
+    List,
+    Optional,
+    Sequence,
+    Type,
+    Union,
+    no_type_check,
+)
 
 from jinja2 import ChoiceLoader, FileSystemLoader, PackageLoader
 from sqlalchemy.engine import Engine
 from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession
 from sqlalchemy.orm import Session, sessionmaker
 from starlette.applications import Starlette
-from starlette.datastructures import FormData
+from starlette.datastructures import URL, FormData, UploadFile
 from starlette.exceptions import HTTPException
 from starlette.middleware import Middleware
 from starlette.requests import Request
@@ -404,7 +414,7 @@ class Admin(BaseAdminView):
 
             await model_view.delete_model(model)
 
-        return Response(content=request.url_for("admin:list", identity=identity))
+        return Response(content=str(request.url_for("admin:list", identity=identity)))
 
     @login_required
     async def create(self, request: Request) -> Response:
@@ -416,7 +426,7 @@ class Admin(BaseAdminView):
         model_view = self._find_model_view(identity)
 
         Form = await model_view.scaffold_form()
-        form_data = await request.form()
+        form_data = await self._handle_form_data(request)
         form = Form(form_data)
 
         context = {
@@ -472,7 +482,7 @@ class Admin(BaseAdminView):
         if request.method == "GET":
             return self.templates.TemplateResponse(model_view.edit_template, context)
 
-        form_data = await request.form()
+        form_data = await self._handle_form_data(request, model)
         form = Form(form_data)
         if not form.validate():
             context["form"] = form
@@ -559,7 +569,7 @@ class Admin(BaseAdminView):
 
     def get_save_redirect_url(
         self, request: Request, form: FormData, model_view: ModelView, obj: Any
-    ) -> str:
+    ) -> Union[str, URL]:
         """
         Get the redirect URL after a save action
         which is triggered from create/edit page.
@@ -576,6 +586,32 @@ class Admin(BaseAdminView):
             return request.url_for("admin:edit", identity=identity, pk=pk)
         return request.url_for("admin:create", identity=identity)
 
+    async def _handle_form_data(self, request: Request, obj: Any = None) -> FormData:
+        """
+        Handle form data and modify in case of UplaodFile.
+        This is needed since in edit page
+        there's no way to show current file of object.
+        """
+
+        form = await request.form()
+        form_data: Dict[str, Any] = {}
+
+        for key, value in form.items():
+            if not isinstance(value, UploadFile):
+                form_data[key] = value
+                continue
+
+            should_clear = form.get(key + "_checkbox")
+            empty_upload = len(await value.read(1)) != 1
+            if should_clear:
+                form_data[key] = None
+            elif empty_upload and getattr(obj, key):
+                f = getattr(obj, key)  # In case of update, imitate UploadFile
+                form_data[key] = UploadFile(filename=f.name, file=f.open())
+            else:
+                form_data[key] = value
+        return FormData(form_data)
+
 
 def expose(
     path: str,

{sqladmin-0.9.0 → sqladmin-0.10.0}/sqladmin/authentication.py

@@ -1,10 +1,10 @@
 import functools
-from typing import Any, Callable
+from typing import Any, Callable, Optional
 
 from starlette.middleware import Middleware
 from starlette.middleware.sessions import SessionMiddleware
 from starlette.requests import Request
-from starlette.responses import RedirectResponse
+from starlette.responses import Response
 
 
 class AuthenticationBackend:
@@ -31,10 +31,14 @@ class AuthenticationBackend:
         """
         raise NotImplementedError()
 
-    async def authenticate(self, request: Request) -> bool:
+    async def authenticate(self, request: Request) -> Optional[Response]:
         """Implement authenticate logic here.
         This method will be called for each incoming request
         to validate the authentication.
+
+        If the request is authenticated, this method should return `None` or do nothing.
+        Otherwise it should return a `Response` object,
+        like a redirect to the login page or SSO page.
         """
         raise NotImplementedError()
 
@@ -49,9 +53,9 @@ def login_required(func: Callable[..., Any]) -> Callable[..., Any]:
         admin, request = args[0], args[1]
         auth_backend = admin.authentication_backend
         if auth_backend is not None:
-            is_authenticated = await auth_backend.authenticate(request)
-            if not is_authenticated:
-                return RedirectResponse(request.url_for("admin:login"), status_code=302)
+            response = await auth_backend.authenticate(request)
+            if response and isinstance(response, Response):
+                return response
 
         return await func(*args, **kwargs)
 

{sqladmin-0.9.0 → sqladmin-0.10.0}/sqladmin/fields.py

@@ -7,12 +7,14 @@ from wtforms import Form, ValidationError, fields, widgets
 
 from sqladmin import widgets as sqladmin_widgets
 from sqladmin.ajax import QueryAjaxModelLoader
+from sqladmin.helpers import parse_interval
 
 __all__ = [
     "AjaxSelectField",
     "AjaxSelectMultipleField",
     "DateField",
     "DateTimeField",
+    "IntervalField",
     "JSONField",
     "QuerySelectField",
     "QuerySelectMultipleField",
@@ -46,6 +48,22 @@ class TimeField(fields.TimeField):
     widget = sqladmin_widgets.TimePickerWidget()
 
 
+class IntervalField(fields.StringField):
+    """
+    A text field which stores a `datetime.timedelta` object.
+    """
+
+    def process_formdata(self, valuelist: List[str]) -> None:
+        if not valuelist:
+            return
+
+        interval = parse_interval(valuelist[0])
+        if not interval:
+            raise ValueError("Invalide timedelta format.")
+
+        self.data = interval
+
+
 class SelectField(fields.SelectField):
     def __init__(
         self,
@@ -370,3 +388,11 @@ class Select2TagsField(fields.SelectField):
 
     def process_data(self, value: Optional[list]) -> None:
         self.data = value or []
+
+
+class FileField(fields.FileField):
+    """
+    File field which is clearable.
+    """
+
+    widget = sqladmin_widgets.FileInputWidget()

{sqladmin-0.9.0 → sqladmin-0.10.0}/sqladmin/forms.py

@@ -47,6 +47,8 @@ from sqladmin.fields import (
     AjaxSelectMultipleField,
     DateField,
     DateTimeField,
+    FileField,
+    IntervalField,
     JSONField,
     QuerySelectField,
     QuerySelectMultipleField,
@@ -414,10 +416,12 @@ class ModelConverter(ModelConverterBase):
     ) -> UnboundField:
         return JSONField(**kwargs)
 
-    # @converts("dialects.mysql.types.YEAR", "dialects.mysql.base.YEAR")
-    # def conv_MSYear(self, field_args: Dict, **kwargs: Any) -> Field:
-    #     field_args["validators"].append(validators.NumberRange(min=1901, max=2155))
-    #     return StringField(**field_args)
+    @converts("Interval")
+    def conv_interval(
+        self, model: type, prop: ColumnProperty, kwargs: Dict[str, Any]
+    ) -> UnboundField:
+        kwargs["render_kw"]["placeholder"] = "Like: 1 day 1:25:33.652"
+        return IntervalField(**kwargs)
 
     @converts(
         "sqlalchemy.dialects.postgresql.base.INET",
@@ -427,7 +431,6 @@ class ModelConverter(ModelConverterBase):
     def conv_ip_address(
         self, model: type, prop: ColumnProperty, kwargs: Dict[str, Any]
     ) -> UnboundField:
-        kwargs.setdefault("label", "IP Address")
         kwargs.setdefault("validators", [])
         kwargs["validators"].append(validators.IPAddress(ipv4=True, ipv6=True))
         return StringField(**kwargs)
@@ -439,7 +442,6 @@ class ModelConverter(ModelConverterBase):
     def conv_mac_address(
         self, model: type, prop: ColumnProperty, kwargs: Dict[str, Any]
     ) -> UnboundField:
-        kwargs.setdefault("label", "MAC Address")
         kwargs.setdefault("validators", [])
         kwargs["validators"].append(validators.MacAddress())
         return StringField(**kwargs)
@@ -452,7 +454,6 @@ class ModelConverter(ModelConverterBase):
     def conv_uuid(
         self, model: type, prop: ColumnProperty, kwargs: Dict[str, Any]
     ) -> UnboundField:
-        kwargs.setdefault("label", "UUID")
         kwargs.setdefault("validators", [])
         kwargs["validators"].append(validators.UUID())
         return StringField(**kwargs)
@@ -469,7 +470,6 @@ class ModelConverter(ModelConverterBase):
     def conv_email(
         self, model: type, prop: ColumnProperty, kwargs: Dict[str, Any]
     ) -> UnboundField:
-        kwargs.setdefault("label", "Email")
         kwargs.setdefault("validators", [])
         kwargs["validators"].append(validators.Email())
         return StringField(**kwargs)
@@ -516,6 +516,12 @@ class ModelConverter(ModelConverterBase):
         kwargs["validators"].append(ColorValidator())
         return StringField(**kwargs)
 
+    @converts("sqlalchemy_fields.types.file.FileType")
+    def conv_file(
+        self, model: type, prop: ColumnProperty, kwargs: Dict[str, Any]
+    ) -> UnboundField:
+        return FileField(**kwargs)
+
     @converts("ONETOONE")
     def conv_one_to_one(
         self, model: type, prop: RelationshipProperty, kwargs: Dict[str, Any]

{sqladmin-0.9.0 → sqladmin-0.10.0}/sqladmin/helpers.py

@@ -3,12 +3,28 @@ import os
 import re
 import unicodedata
 from abc import ABC, abstractmethod
-from typing import Callable, Generator, List, TypeVar
+from datetime import timedelta
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Dict,
+    Generator,
+    List,
+    Optional,
+    TypeVar,
+    Union,
+)
 
 from sqlalchemy import Column, inspect
 from sqlalchemy.orm import RelationshipProperty
+from sqlalchemy.orm.attributes import InstrumentedAttribute
 
 from sqladmin._types import MODEL_PROPERTY
+from sqladmin.exceptions import InvalidColumnError
+
+if TYPE_CHECKING:
+    from sqladmin.models import ModelView
 
 T = TypeVar("T")
 
@@ -28,6 +44,44 @@ _windows_device_files = (
     "NUL",
 )
 
+standard_duration_re = re.compile(
+    r"^"
+    r"(?:(?P<days>-?\d+) (days?, )?)?"
+    r"(?P<sign>-?)"
+    r"((?:(?P<hours>\d+):)(?=\d+:\d+))?"
+    r"(?:(?P<minutes>\d+):)?"
+    r"(?P<seconds>\d+)"
+    r"(?:[\.,](?P<microseconds>\d{1,6})\d{0,6})?"
+    r"$"
+)
+
+# Support the sections of ISO 8601 date representation that are accepted by timedelta
+iso8601_duration_re = re.compile(
+    r"^(?P<sign>[-+]?)"
+    r"P"
+    r"(?:(?P<days>\d+([\.,]\d+)?)D)?"
+    r"(?:T"
+    r"(?:(?P<hours>\d+([\.,]\d+)?)H)?"
+    r"(?:(?P<minutes>\d+([\.,]\d+)?)M)?"
+    r"(?:(?P<seconds>\d+([\.,]\d+)?)S)?"
+    r")?"
+    r"$"
+)
+
+# Support PostgreSQL's day-time interval format, e.g. "3 days 04:05:06". The
+# year-month and mixed intervals cannot be converted to a timedelta and thus
+# aren't accepted.
+postgres_interval_re = re.compile(
+    r"^"
+    r"(?:(?P<days>-?\d+) (days? ?))?"
+    r"(?:(?P<sign>[-+])?"
+    r"(?P<hours>\d+):"
+    r"(?P<minutes>\d\d):"
+    r"(?P<seconds>\d\d)"
+    r"(?:\.(?P<microseconds>\d{1,6}))?"
+    r")?$"
+)
+
 
 def prettify_class_name(name: str) -> str:
     return re.sub(r"(?<=.)([A-Z])", r" \1", name)
@@ -138,3 +192,38 @@ def get_column_python_type(column: Column) -> type:
 
 def is_relationship(prop: MODEL_PROPERTY) -> bool:
     return isinstance(prop, RelationshipProperty)
+
+
+def parse_interval(value: str) -> Optional[timedelta]:
+    match = (
+        standard_duration_re.match(value)
+        or iso8601_duration_re.match(value)
+        or postgres_interval_re.match(value)
+    )
+
+    if not match:
+        return None
+
+    kw: Dict[str, Any] = match.groupdict()
+    sign = -1 if kw.pop("sign", "+") == "-" else 1
+    if kw.get("microseconds"):
+        kw["microseconds"] = kw["microseconds"].ljust(6, "0")
+    kw = {k: float(v.replace(",", ".")) for k, v in kw.items() if v is not None}
+    days = timedelta(kw.pop("days", 0.0) or 0.0)
+    if match.re == iso8601_duration_re:
+        days *= sign
+    return days + sign * timedelta(**kw)
+
+
+def map_attr_to_prop(
+    attr: Union[str, InstrumentedAttribute], model_admin: "ModelView"
+) -> MODEL_PROPERTY:
+    if isinstance(attr, InstrumentedAttribute):
+        attr = attr.prop.key
+
+    try:
+        return model_admin._props[attr]
+    except KeyError:
+        raise InvalidColumnError(
+            f"Model '{model_admin.model.__name__}' has no attribute '{attr}'."
+        )

{sqladmin-0.9.0 → sqladmin-0.10.0}/sqladmin/models.py

@@ -28,6 +28,7 @@ from sqlalchemy.orm import (
 from sqlalchemy.orm.attributes import InstrumentedAttribute
 from sqlalchemy.sql.elements import ClauseElement
 from sqlalchemy.sql.expression import Select, select
+from starlette.datastructures import URL
 from starlette.requests import Request
 from starlette.responses import StreamingResponse
 from starlette.templating import Jinja2Templates
@@ -36,13 +37,14 @@ from wtforms import Field, Form
 from sqladmin._queries import Query
 from sqladmin._types import ENGINE_TYPE, MODEL_PROPERTY
 from sqladmin.ajax import create_ajax_loader
-from sqladmin.exceptions import InvalidColumnError, InvalidModelError
+from sqladmin.exceptions import InvalidModelError
 from sqladmin.formatters import BASE_FORMATTERS
 from sqladmin.forms import ModelConverter, ModelConverterBase, get_model_form
 from sqladmin.helpers import (
     Writer,
     get_column_python_type,
     get_primary_key,
+    map_attr_to_prop,
     prettify_class_name,
     secure_filename,
     slugify_class_name,
@@ -691,13 +693,13 @@ class ModelView(BaseView, metaclass=ModelViewMeta):
 
         column_formatters = getattr(self, "column_formatters", {})
         self._list_formatters = {
-            self._attr_to_prop(attr): formatter
+            map_attr_to_prop(attr, self): formatter
             for (attr, formatter) in column_formatters.items()
         }
 
         column_formatters_detail = getattr(self, "column_formatters_detail", {})
         self._detail_formatters = {
-            self._attr_to_prop(attr): formatter
+            map_attr_to_prop(attr, self): formatter
             for (attr, formatter) in column_formatters_detail.items()
         }
 
@@ -711,7 +713,7 @@ class ModelView(BaseView, metaclass=ModelViewMeta):
         ]
 
         self._sort_fields = [
-            self._attr_to_prop(attr).key for attr in self.column_sortable_list
+            map_attr_to_prop(attr, self).key for attr in self.column_sortable_list
         ]
 
         self._form_ajax_refs = {}
@@ -733,7 +735,7 @@ class ModelView(BaseView, metaclass=ModelViewMeta):
         else:
             return await anyio.to_thread.run_sync(self._run_query_sync, stmt)
 
-    def _url_for_details(self, request: Request, obj: Any) -> str:
+    def _url_for_details(self, request: Request, obj: Any) -> Union[str, URL]:
         pk = getattr(obj, self.pk_column.name)
         return request.url_for(
             "admin:details",
@@ -741,7 +743,7 @@ class ModelView(BaseView, metaclass=ModelViewMeta):
             pk=pk,
         )
 
-    def _url_for_edit(self, request: Request, obj: Any) -> str:
+    def _url_for_edit(self, request: Request, obj: Any) -> Union[str, URL]:
         pk = getattr(obj, self.pk_column.name)
         return request.url_for(
             "admin:edit",
@@ -755,11 +757,11 @@ class ModelView(BaseView, metaclass=ModelViewMeta):
         url = request.url_for(
             "admin:delete", identity=slugify_class_name(obj.__class__.__name__)
         )
-        return url + "?" + query_params
+        return str(url) + "?" + query_params
 
     def _url_for_details_with_prop(
         self, request: Request, obj: Any, prop: RelationshipProperty
-    ) -> str:
+    ) -> Union[str, URL]:
         target = getattr(obj, prop.key)
         if target is None:
             return ""
@@ -889,19 +891,6 @@ class ModelView(BaseView, metaclass=ModelViewMeta):
             formatted_value = formatter(obj, prop)
         return value, formatted_value
 
-    def _attr_to_prop(self, attr: Union[str, InstrumentedAttribute]) -> MODEL_PROPERTY:
-        if isinstance(attr, str):
-            key = attr
-        else:
-            key = attr.prop.key
-
-        if key in self._props:
-            return self._props[key]
-
-        raise InvalidColumnError(
-            f"Model '{self.model.__name__}' has no attribute '{key}'."
-        )
-
     def _build_column_list(
         self,
         defaults: List[MODEL_PROPERTY],
@@ -912,9 +901,9 @@ class ModelView(BaseView, metaclass=ModelViewMeta):
         for any sequence of inclusions or exclusions.
         """
         if include:
-            props = [self._attr_to_prop(prop) for prop in include]
+            props = [map_attr_to_prop(prop, self) for prop in include]
         elif exclude:
-            exclude_props = {self._attr_to_prop(prop) for prop in exclude}
+            exclude_props = {map_attr_to_prop(prop, self) for prop in exclude}
             props = [prop for prop in self._props if prop not in exclude_props]
         else:
             props = defaults
@@ -951,11 +940,6 @@ class ModelView(BaseView, metaclass=ModelViewMeta):
         form_columns = getattr(self, "form_columns", None)
         form_excluded_columns = getattr(self, "form_excluded_columns", None)
 
-        default = []
-        for prop in self._props:
-            if prop in self._relation_props or prop in self._column_props:
-                default.append(prop)
-
         return self._build_column_list(
             include=form_columns,
             exclude=form_excluded_columns,
@@ -991,7 +975,7 @@ class ModelView(BaseView, metaclass=ModelViewMeta):
         self,
     ) -> Dict[MODEL_PROPERTY, str]:
         return {
-            self._attr_to_prop(column_label): value
+            map_attr_to_prop(column_label, self): value
             for column_label, value in self.column_labels.items()
         }
 
@@ -1005,12 +989,12 @@ class ModelView(BaseView, metaclass=ModelViewMeta):
         return await Query(self).update(pk, data)
 
     async def on_model_delete(self, model: Any) -> None:
-        """Perform some actions before a model is created or updated.
+        """Perform some actions before a model is deleted.
         By default does nothing.
         """
 
     async def after_model_delete(self, model: Any) -> None:
-        """Perform some actions before a model is deleted.
+        """Perform some actions after a model is deleted.
         By default do nothing.
         """
 
@@ -1045,7 +1029,7 @@ class ModelView(BaseView, metaclass=ModelViewMeta):
         """
 
         search_fields = [
-            self._attr_to_prop(attr) for attr in self.column_searchable_list
+            map_attr_to_prop(attr, self) for attr in self.column_searchable_list
         ]
         field_names = [
             self._column_labels.get(field, field.key) for field in search_fields

{sqladmin-0.9.0 → sqladmin-0.10.0}/sqladmin/templates/create.html

@@ -6,7 +6,7 @@
       <h3 class="card-title">New {{ model_view.name }}</h3>
     </div>
     <div class="card-body border-bottom py-3">
-      <form action="{{ request.url }}" method="POST">
+      <form action="{{ request.url }}" method="POST" enctype="multipart/form-data">
         <fieldset class="form-fieldset">
           {% for field in form %}
           <div class="mb-3 form-group row">

{sqladmin-0.9.0 → sqladmin-0.10.0}/sqladmin/templates/edit.html

@@ -6,7 +6,7 @@
       <h3 class="card-title">Edit {{ model_view.name }}</h3>
     </div>
     <div class="card-body border-bottom py-3">
-      <form action="{{ request.url }}" method="POST">
+      <form action="{{ request.url }}" method="POST" enctype="multipart/form-data">
         <fieldset class="form-fieldset">
           {% for field in form %}
           <div class="mb-3 form-group row">

{sqladmin-0.9.0 → sqladmin-0.10.0}/sqladmin/widgets.py

@@ -77,3 +77,23 @@ class Select2TagsWidget(widgets.Select):
         kwargs.setdefault("data-role", "select2-tags")
         kwargs.setdefault("data-json", json.dumps(field.data))
         return super().__call__(field, **kwargs)
+
+
+class FileInputWidget(widgets.FileInput):
+    """
+    File input widget with clear checkbox.
+    """
+
+    def __call__(self, field: Field, **kwargs: Any) -> str:
+        file_input = super().__call__(field, **kwargs)
+        checkbox_id = f"{field.id}_checkbox"
+        checkbox_label = Markup(
+            f'<label class="form-check-label" for="{checkbox_id}">Clear</label>'
+        )
+        checkbox_input = Markup(
+            f'<input class="form-check-input" type="checkbox" id="{checkbox_id}" name="{checkbox_id}">'  # noqa: E501
+        )
+        checkbox = Markup(
+            f'<div class="form-check">{checkbox_input}{checkbox_label}</div>'
+        )
+        return file_input + checkbox