pixeltable 0.2.20__py3-none-any.whl → 0.2.22__py3-none-any.whl

pixeltable/functions/string.py

@@ -14,12 +14,12 @@ t.select(pxt_str.capitalize(t.str_col)).collect()
 
 from typing import Any, Optional
 
+import pixeltable as pxt
 import pixeltable.exceptions as excs
-import pixeltable.func as func
 from pixeltable.utils.code import local_public_names
 
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def capitalize(self: str) -> str:
     """
     Return string with its first character capitalized and the rest lowercased.
@@ -28,7 +28,7 @@ def capitalize(self: str) -> str:
     """
     return self.capitalize()
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def casefold(self: str) -> str:
     """
     Return a casefolded copy of string.
@@ -37,7 +37,7 @@ def casefold(self: str) -> str:
     """
     return self.casefold()
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def center(self: str, width: int, fillchar: str = ' ') -> str:
     """
     Return a centered string of length `width`.
@@ -50,7 +50,7 @@ def center(self: str, width: int, fillchar: str = ' ') -> str:
     """
     return self.center(width, fillchar)
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def contains(self: str, pattern: str, case: bool = True, flags: int = 0, regex: bool = True) -> bool:
     """
     Test if string contains pattern or regex.
@@ -72,7 +72,7 @@ def contains(self: str, pattern: str, case: bool = True, flags: int = 0, regex:
         else:
             return pattern.lower() in self.lower()
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def count(self: str, pattern: str, flags: int = 0) -> int:
     """
     Count occurrences of pattern or regex.
@@ -85,7 +85,7 @@ def count(self: str, pattern: str, flags: int = 0) -> int:
     from builtins import len
     return len(re.findall(pattern, self, flags))
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def endswith(self: str, pattern: str) -> bool:
     """
     Return `True` if the string ends with the specified suffix, otherwise return `False`.
@@ -97,7 +97,7 @@ def endswith(self: str, pattern: str) -> bool:
     """
     return self.endswith(pattern)
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def fill(self: str, width: int, **kwargs: Any) -> str:
     """
     Wraps the single paragraph in string, and returns a single string containing the wrapped paragraph.
@@ -111,7 +111,7 @@ def fill(self: str, width: int, **kwargs: Any) -> str:
     import textwrap
     return textwrap.fill(self, width, **kwargs)
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def find(self: str, substr: str, start: Optional[int] = 0, end: Optional[int] = None) -> int:
     """
     Return the lowest index in string where `substr` is found within the slice `s[start:end]`.
@@ -125,7 +125,7 @@ def find(self: str, substr: str, start: Optional[int] = 0, end: Optional[int] =
     """
     return self.find(substr, start, end)
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def findall(self: str, pattern: str, flags: int = 0) -> list:
     """
     Find all occurrences of a regular expression pattern in string.
@@ -139,7 +139,7 @@ def findall(self: str, pattern: str, flags: int = 0) -> list:
     import re
     return re.findall(pattern, self, flags)
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def format(self: str, *args: Any, **kwargs: Any) -> str:
     """
     Perform string formatting.
@@ -148,7 +148,7 @@ def format(self: str, *args: Any, **kwargs: Any) -> str:
     """
     return self.format(*args, **kwargs)
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def fullmatch(self: str, pattern: str, case: bool = True, flags: int = 0) -> bool:
     """
     Determine if string fully matches a regular expression.
@@ -166,7 +166,7 @@ def fullmatch(self: str, pattern: str, case: bool = True, flags: int = 0) -> boo
     _ = bool(re.fullmatch(pattern, self, flags))
     return bool(re.fullmatch(pattern, self, flags))
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def index(self: str, substr: str, start: Optional[int] = 0, end: Optional[int] = None) -> int:
     """
     Return the lowest index in string where `substr` is found within the slice `[start:end]`.
@@ -181,7 +181,7 @@ def index(self: str, substr: str, start: Optional[int] = 0, end: Optional[int] =
     """
     return self.index(substr, start, end)
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def isalnum(self: str) -> bool:
     """
     Return `True` if all characters in the string are alphanumeric and there is at least one character, `False`
@@ -191,7 +191,7 @@ def isalnum(self: str) -> bool:
     """
     return self.isalnum()
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def isalpha(self: str) -> bool:
     """
     Return `True` if all characters in the string are alphabetic and there is at least one character, `False` otherwise.
@@ -200,7 +200,7 @@ def isalpha(self: str) -> bool:
     """
     return self.isalpha()
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def isascii(self: str) -> bool:
     """
     Return `True` if the string is empty or all characters in the string are ASCII, `False` otherwise.
@@ -209,7 +209,7 @@ def isascii(self: str) -> bool:
     """
     return self.isascii()
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def isdecimal(self: str) -> bool:
     """
     Return `True` if all characters in the string are decimal characters and there is at least one character, `False`
@@ -219,7 +219,7 @@ def isdecimal(self: str) -> bool:
     """
     return self.isdecimal()
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def isdigit(self: str) -> bool:
     """
     Return `True` if all characters in the string are digits and there is at least one character, `False` otherwise.
@@ -228,7 +228,7 @@ def isdigit(self: str) -> bool:
     """
     return self.isdigit()
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def isidentifier(self: str) -> bool:
     """
     Return `True` if the string is a valid identifier according to the language definition, `False` otherwise.
@@ -238,7 +238,7 @@ def isidentifier(self: str) -> bool:
     return self.isidentifier()
 
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def islower(self: str) -> bool:
     """
     Return `True` if all cased characters in the string are lowercase and there is at least one cased character, `False` otherwise.
@@ -247,7 +247,7 @@ def islower(self: str) -> bool:
     """
     return self.islower()
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def isnumeric(self: str) -> bool:
     """
     Return `True` if all characters in the string are numeric characters, `False` otherwise.
@@ -256,7 +256,7 @@ def isnumeric(self: str) -> bool:
     """
     return self.isnumeric()
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def isupper(self: str) -> bool:
     """
     Return `True` if all cased characters in the string are uppercase and there is at least one cased character, `False` otherwise.
@@ -265,7 +265,7 @@ def isupper(self: str) -> bool:
     """
     return self.isupper()
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def istitle(self: str) -> bool:
     """
     Return `True` if the string is a titlecased string and there is at least one character, `False` otherwise.
@@ -274,7 +274,7 @@ def istitle(self: str) -> bool:
     """
     return self.istitle()
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def isspace(self: str) -> bool:
     """
     Return `True` if there are only whitespace characters in the string and there is at least one character, `False` otherwise.
@@ -283,7 +283,16 @@ def isspace(self: str) -> bool:
     """
     return self.isspace()
 
-@func.udf(is_method=True)
+@pxt.udf
+def join(sep: str, elements: list) -> str:
+    """
+    Return a string which is the concatenation of the strings in `elements`.
+
+    Equivalent to [`str.join()`](https://docs.python.org/3/library/stdtypes.html#str.join)
+    """
+    return sep.join(elements)
+
+@pxt.udf(is_method=True)
 def len(self: str) -> int:
     """
     Return the number of characters in the string.
@@ -292,7 +301,7 @@ def len(self: str) -> int:
     """
     return self.__len__()
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def ljust(self: str, width: int, fillchar: str = ' ') -> str:
     """
     Return the string left-justified in a string of length `width`.
@@ -305,7 +314,7 @@ def ljust(self: str, width: int, fillchar: str = ' ') -> str:
     """
     return self.ljust(width, fillchar)
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def lower(self: str) -> str:
     """
     Return a copy of the string with all the cased characters converted to lowercase.
@@ -314,7 +323,7 @@ def lower(self: str) -> str:
     """
     return self.lower()
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def lstrip(self: str, chars: Optional[str] = None) -> str:
     """
     Return a copy of the string with leading characters removed. The `chars` argument is a string specifying the set of
@@ -327,7 +336,7 @@ def lstrip(self: str, chars: Optional[str] = None) -> str:
     """
     return self.lstrip(chars)
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def match(self: str, pattern: str, case: bool = True, flags: int = 0) -> bool:
     """
     Determine if string starts with a match of a regular expression
@@ -342,7 +351,7 @@ def match(self: str, pattern: str, case: bool = True, flags: int = 0) -> bool:
         flags |= re.IGNORECASE
     return bool(re.match(pattern, self, flags))
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def normalize(self: str, form: str) -> str:
     """
     Return the Unicode normal form.
@@ -355,7 +364,7 @@ def normalize(self: str, form: str) -> str:
     import unicodedata
     return unicodedata.normalize(form, self)  # type: ignore[arg-type]
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def pad(self: str, width: int, side: str = 'left', fillchar: str = ' ') -> str:
     """
     Pad string up to width
@@ -374,7 +383,7 @@ def pad(self: str, width: int, side: str = 'left', fillchar: str = ' ') -> str:
     else:
         raise ValueError(f"Invalid side: {side}")
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def partition(self: str, sep: str = ' ') -> list:
     """
     Splits string at the first occurrence of `sep`, and returns 3 elements containing the part before the
@@ -387,7 +396,7 @@ def partition(self: str, sep: str = ' ') -> list:
     from builtins import len
     return [self[:idx], sep, self[idx + len(sep):]]
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def removeprefix(self: str, prefix: str) -> str:
     """
     Remove prefix. If the prefix is not present, returns string.
@@ -398,7 +407,7 @@ def removeprefix(self: str, prefix: str) -> str:
         return self[len(prefix):]
     return self
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def removesuffix(self: str, suffix: str) -> str:
     """
     Remove suffix. If the suffix is not present, returns string.
@@ -409,14 +418,14 @@ def removesuffix(self: str, suffix: str) -> str:
         return self[:-len(suffix)]
     return self
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def repeat(self: str, n: int) -> str:
     """
     Repeat string `n` times.
     """
     return self * n
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def replace(
         self: str, pattern: str, repl: str, n: int = -1, case: bool = True, flags: int = 0, regex: bool = False
 ) -> str:
@@ -442,7 +451,7 @@ def replace(
     else:
         return self.replace(pattern, repl, n)
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def rfind(self: str, substr: str, start: Optional[int] = 0, end: Optional[int] = None) -> int:
     """
     Return the highest index where `substr` is found, such that `substr` is contained within `[start:end]`.
@@ -456,7 +465,7 @@ def rfind(self: str, substr: str, start: Optional[int] = 0, end: Optional[int] =
     """
     return self.rfind(substr, start, end)
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def rindex(self: str, substr: str, start: Optional[int] = 0, end: Optional[int] = None) -> int:
     """
     Return the highest index where `substr` is found, such that `substr` is contained within `[start:end]`.
@@ -466,7 +475,7 @@ def rindex(self: str, substr: str, start: Optional[int] = 0, end: Optional[int]
     """
     return self.rindex(substr, start, end)
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def rjust(self: str, width: int, fillchar: str = ' ') -> str:
     """
     Return the string right-justified in a string of length `width`.
@@ -479,7 +488,7 @@ def rjust(self: str, width: int, fillchar: str = ' ') -> str:
     """
     return self.rjust(width, fillchar)
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def rpartition(self: str, sep: str = ' ') -> list:
     """
     This method splits string at the last occurrence of `sep`, and returns a list containing the part before the
@@ -491,7 +500,7 @@ def rpartition(self: str, sep: str = ' ') -> list:
     from builtins import len
     return [self[:idx], sep, self[idx + len(sep):]]
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def rstrip(self: str, chars: Optional[str] = None) -> str:
     """
     Return a copy of string with trailing characters removed.
@@ -503,7 +512,7 @@ def rstrip(self: str, chars: Optional[str] = None) -> str:
     """
     return self.rstrip(chars)
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def slice(self: str, start: Optional[int] = None, stop: Optional[int] = None, step: Optional[int] = None) -> str:
     """
     Return a slice.
@@ -515,7 +524,7 @@ def slice(self: str, start: Optional[int] = None, stop: Optional[int] = None, st
     """
     return self[start:stop:step]
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def slice_replace(self: str, start: Optional[int] = None, stop: Optional[int] = None, repl: Optional[str] = None) -> str:
     """
     Replace a positional slice with another value.
@@ -527,7 +536,7 @@ def slice_replace(self: str, start: Optional[int] = None, stop: Optional[int] =
     """
     return self[:start] + repl + self[stop:]
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def startswith(self: str, pattern: str) -> int:
     """
     Return `True` if string starts with `pattern`, otherwise return `False`.
@@ -539,7 +548,7 @@ def startswith(self: str, pattern: str) -> int:
     """
     return self.startswith(pattern)
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def strip(self: str, chars: Optional[str] = None) -> str:
     """
     Return a copy of string with leading and trailing characters removed.
@@ -551,7 +560,7 @@ def strip(self: str, chars: Optional[str] = None) -> str:
     """
     return self.strip(chars)
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def swapcase(self: str) -> str:
     """
     Return a copy of string with uppercase characters converted to lowercase and vice versa.
@@ -560,7 +569,7 @@ def swapcase(self: str) -> str:
     """
     return self.swapcase()
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def title(self: str) -> str:
     """
     Return a titlecased version of string, i.e. words start with uppercase characters, all remaining cased characters
@@ -570,7 +579,7 @@ def title(self: str) -> str:
     """
     return self.title()
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def upper(self: str) -> str:
     """
     Return a copy of string converted to uppercase.
@@ -579,7 +588,7 @@ def upper(self: str) -> str:
     """
     return self.upper()
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def wrap(self: str, width: int, **kwargs: Any) -> list[str]:
     """
     Wraps the single paragraph in string so every line is at most `width` characters long.
@@ -594,7 +603,7 @@ def wrap(self: str, width: int, **kwargs: Any) -> list[str]:
     import textwrap
     return textwrap.wrap(self, width, **kwargs)
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def zfill(self: str, width: int) -> str:
     """
     Pad a numeric string with ASCII `0` on the left to a total length of `width`.

pixeltable/functions/timestamp.py

@@ -15,12 +15,12 @@ from typing import Optional
 
 import sqlalchemy as sql
 
+import pixeltable as pxt
 from pixeltable.env import Env
-import pixeltable.func as func
 from pixeltable.utils.code import local_public_names
 
 
-@func.udf(is_property=True)
+@pxt.udf(is_property=True)
 def year(self: datetime) -> int:
     """
     Between [`MINYEAR`](https://docs.python.org/3/library/datetime.html#datetime.MINYEAR) and
@@ -36,7 +36,7 @@ def _(self: sql.ColumnElement) -> sql.ColumnElement:
     return sql.extract('year', self)
 
 
-@func.udf(is_property=True)
+@pxt.udf(is_property=True)
 def month(self: datetime) -> int:
     """
     Between 1 and 12 inclusive.
@@ -51,7 +51,7 @@ def _(self: sql.ColumnElement) -> sql.ColumnElement:
     return sql.extract('month', self)
 
 
-@func.udf(is_property=True)
+@pxt.udf(is_property=True)
 def day(self: datetime) -> int:
     """
     Between 1 and the number of days in the given month of the given year.
@@ -66,7 +66,7 @@ def _(self: sql.ColumnElement) -> sql.ColumnElement:
     return sql.extract('day', self)
 
 
-@func.udf(is_property=True)
+@pxt.udf(is_property=True)
 def hour(self: datetime) -> int:
     """
     Between 0 and 23 inclusive.
@@ -81,7 +81,7 @@ def _(self: sql.ColumnElement) -> sql.ColumnElement:
     return sql.extract('hour', self)
 
 
-@func.udf(is_property=True)
+@pxt.udf(is_property=True)
 def minute(self: datetime) -> int:
     """
     Between 0 and 59 inclusive.
@@ -96,7 +96,7 @@ def _(self: sql.ColumnElement) -> sql.ColumnElement:
     return sql.extract('minute', self)
 
 
-@func.udf(is_property=True)
+@pxt.udf(is_property=True)
 def second(self: datetime) -> int:
     """
     Between 0 and 59 inclusive.
@@ -111,7 +111,7 @@ def _(self: sql.ColumnElement) -> sql.ColumnElement:
     return sql.extract('second', self)
 
 
-@func.udf(is_property=True)
+@pxt.udf(is_property=True)
 def microsecond(self: datetime) -> int:
     """
     Between 0 and 999999 inclusive.
@@ -126,7 +126,7 @@ def _(self: sql.ColumnElement) -> sql.ColumnElement:
     return sql.extract('microseconds', self) - sql.extract('second', self) * 1000000
 
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def astimezone(self: datetime, tz: str) -> datetime:
     """
     Convert the datetime to the given time zone.
@@ -139,7 +139,7 @@ def astimezone(self: datetime, tz: str) -> datetime:
     return self.astimezone(tzinfo)
 
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def weekday(self: datetime) -> int:
     """
     Between 0 (Monday) and 6 (Sunday) inclusive.
@@ -154,7 +154,7 @@ def _(self: sql.ColumnElement) -> sql.ColumnElement:
     return sql.extract('isodow', self) - 1
 
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def isoweekday(self: datetime) -> int:
     """
     Return the day of the week as an integer, where Monday is 1 and Sunday is 7.
@@ -169,7 +169,7 @@ def _(self: sql.ColumnElement) -> sql.ColumnElement:
     return sql.extract('isodow', self)
 
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def isocalendar(self: datetime) -> dict:
     """
     Return a dictionary with three entries: `'year'`, `'week'`, and `'weekday'`.
@@ -181,7 +181,7 @@ def isocalendar(self: datetime) -> dict:
     return {'year': iso_year, 'week': iso_week, 'weekday': iso_weekday}
 
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def isoformat(self: datetime, sep: str = 'T', timespec: str = 'auto') -> str:
     """
     Return a string representing the date and time in ISO 8601 format.
@@ -195,7 +195,7 @@ def isoformat(self: datetime, sep: str = 'T', timespec: str = 'auto') -> str:
     return self.isoformat(sep=sep, timespec=timespec)
 
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def strftime(self: datetime, format: str) -> str:
     """
     Return a string representing the date and time, controlled by an explicit format string.
@@ -208,7 +208,7 @@ def strftime(self: datetime, format: str) -> str:
     return self.strftime(format)
 
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def make_timestamp(
         year: int, month: int, day: int, hour: int = 0, minute: int = 0, second: int = 0, microsecond: int = 0
 ) -> datetime:
@@ -234,7 +234,7 @@ def _(
         sql.cast(minute, sql.Integer),
         sql.cast(second + microsecond / 1000000.0, sql.Double))
 
-# @func.udf
+# @pxt.udf
 # def date(self: datetime) -> datetime:
 #     """
 #     Return the date part of the datetime.
@@ -245,7 +245,7 @@ def _(
 #     return datetime(d.year, d.month, d.day)
 #
 #
-# @func.udf
+# @pxt.udf
 # def time(self: datetime) -> datetime:
 #     """
 #     Return the time part of the datetime, with microseconds set to 0.
@@ -256,7 +256,7 @@ def _(
 #     return datetime(1, 1, 1, t.hour, t.minute, t.second, t.microsecond)
 
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def replace(
         self: datetime, year: Optional[int] = None, month: Optional[int] = None, day: Optional[int] = None,
         hour: Optional[int] = None, minute: Optional[int] = None, second: Optional[int] = None,
@@ -271,7 +271,7 @@ def replace(
     return self.replace(**kwargs)
 
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def toordinal(self: datetime) -> int:
     """
     Return the proleptic Gregorian ordinal of the date, where January 1 of year 1 has ordinal 1.
@@ -281,7 +281,7 @@ def toordinal(self: datetime) -> int:
     return self.toordinal()
 
 
-@func.udf(is_method=True)
+@pxt.udf(is_method=True)
 def posix_timestamp(self: datetime) -> float:
     """
     Return POSIX timestamp corresponding to the datetime instance.

pixeltable/functions/together.py

@@ -185,8 +185,8 @@ _embedding_dimensions_cache = {
 }
 
 
-@pxt.udf(batch_size=32, return_type=pxt.ArrayType((None,), dtype=pxt.FloatType()))
-def embeddings(input: Batch[str], *, model: str) -> Batch[np.ndarray]:
+@pxt.udf(batch_size=32)
+def embeddings(input: Batch[str], *, model: str) -> Batch[pxt.Array[(None,), float]]:
     """
     Query an embedding model for a given string of text.
 

pixeltable/functions/video.py

@@ -20,9 +20,8 @@ import av  # type: ignore[import-untyped]
 import numpy as np
 import PIL.Image
 
+import pixeltable as pxt
 import pixeltable.env as env
-import pixeltable.func as func
-import pixeltable.type_system as ts
 from pixeltable.utils.code import local_public_names
 
 _format_defaults = {  # format -> (codec, ext)
@@ -48,14 +47,14 @@ _format_defaults = {  # format -> (codec, ext)
 #         output_container.mux(packet)
 
 
-@func.uda(
-    init_types=[ts.IntType()],
-    update_types=[ts.ImageType()],
-    value_type=ts.VideoType(),
+@pxt.uda(
+    init_types=[pxt.IntType()],
+    update_types=[pxt.ImageType()],
+    value_type=pxt.VideoType(),
     requires_order_by=True,
     allows_window=False,
 )
-class make_video(func.Aggregator):
+class make_video(pxt.Aggregator):
     """
     Aggregator that creates a video from a sequence of images.
     """
@@ -88,18 +87,10 @@ class make_video(func.Aggregator):
         return str(self.out_file)
 
 
-_extract_audio_param_types = [
-    ts.VideoType(nullable=False),
-    ts.IntType(nullable=False),
-    ts.StringType(nullable=False),
-    ts.StringType(nullable=True),
-]
-
-
-@func.udf(return_type=ts.AudioType(nullable=True), param_types=_extract_audio_param_types, is_method=True)
+@pxt.udf(is_method=True)
 def extract_audio(
-    video_path: str, stream_idx: int = 0, format: str = 'wav', codec: Optional[str] = None
-) -> Optional[str]:
+    video_path: pxt.Video, stream_idx: int = 0, format: str = 'wav', codec: Optional[str] = None
+) -> pxt.Audio:
     """
     Extract an audio stream from a video file, save it as a media file and return its path.
 
@@ -128,8 +119,8 @@ def extract_audio(
         return output_filename
 
 
-@func.udf(return_type=ts.JsonType(nullable=False), param_types=[ts.VideoType(nullable=False)], is_method=True)
-def get_metadata(video: str) -> dict:
+@pxt.udf(is_method=True)
+def get_metadata(video: pxt.Video) -> dict:
     """
     Gets various metadata associated with a video file and returns it as a dictionary.
     """