changed way that this_thread is accessed to avoid any issues with it being redefined after being imported; added allow external auth to bypass local auth; downgraded contourpy so that it would not make 3.11 the minimum Python version; upgraded packages as suggested by Dependabot; upgraded numpy because version was yanked

Author: jhpyle

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [1.9.2] - 2026-01-27
+
+### Added
+- The `allow external auth to bypass local auth` Configuration
+  directive.
+
+### Changed
+- The `.bates_number()` method of `DAFile` now accepts parameters
+  `offset_horizontal`, `offset_vertical`, and `font_size`.
+- Upgraded `azure-core`, `wheel`, `numpy`, and `pyasn1`.
+- Downgraded `contourpy` to avoid requiring Python 3.11.
+
 ## [1.9.1] - 2026-01-11
 
 ### Fixed

Dockerfile

@@ -53,7 +53,7 @@ bash -c \
 && python3 -m venv --copies /usr/share/docassemble/local3.12 \
 && source /usr/share/docassemble/local3.12/bin/activate \
 && pip install --upgrade pip==25.3 \
-&& pip install --upgrade wheel==0.45.1 \
+&& pip install --upgrade wheel==0.46.2 \
 && pip install --upgrade mod_wsgi==5.0.2 \
 && pip install --upgrade \
    acme==5.2.2 \

docassemble_base/docassemble/base/data/questions/examples/number-field-numeric.yml

@@ -0,0 +1,25 @@
+metadata:
+  title: Numbers
+  documentation: "https://docassemble.org/docs/fields.html#number"
+---
+features:
+  numeric inputs: True
+---
+question: |
+  Describe your possessions.
+fields:
+  - Number of cars: number_cars
+    datatype: integer
+  - Ounces of gold: gold_ounces
+    datatype: number
+---
+question: Result of question
+subquestion: |
+  % if int(number_cars) == 1:
+  You have only one car.
+  % else:
+  You have ${ number_cars } cars.
+  % endif
+  You also have ${ gold_ounces }
+  ounces of gold.
+mandatory: True

docassemble_base/docassemble/base/file_docx.py

@@ -18,7 +18,8 @@
 from docx.oxml.table import CT_Tbl
 import docx
 from docxcompose.composer import Composer  # For fixing up images, etc when including docx files within templates
-from docassemble.base.functions import server, this_thread, package_template_filename, get_config, roman
+import docassemble.base.functions
+from docassemble.base.functions import server, package_template_filename, get_config, roman
 from docassemble.base.error import DAError
 import docassemble.base.filter
 import docassemble.base.pandoc
@@ -135,13 +136,13 @@ def fix_subdoc(masterdoc, subdoc_info):
 def include_docx_template(template_file, **kwargs):
     """Include the contents of one docx file inside another docx file."""
     use_jinja = kwargs.pop('_use_jinja2', True)
-    if this_thread.evaluation_context is None:
+    if docassemble.base.functions.this_thread.evaluation_context is None:
         return 'ERROR: not in a docx file'
     if template_file.__class__.__name__ in ('DAFile', 'DAFileList', 'DAFileCollection', 'DALocalFile', 'DAStaticFile'):
         template_path = template_file.path()
     else:
-        template_path = package_template_filename(template_file, package=this_thread.current_package)
-    sd = this_thread.misc['docx_template'].new_subdoc()
+        template_path = package_template_filename(template_file, package=docassemble.base.functions.this_thread.current_package)
+    sd = docassemble.base.functions.this_thread.misc['docx_template'].new_subdoc()
     sd.subdocx = docx.Document(template_path)
     change_numbering = bool(kwargs.pop('change_numbering', True))
     if '_inline' in kwargs:
@@ -153,12 +154,12 @@ def include_docx_template(template_file, **kwargs):
     # We need to keep a copy of the subdocs so we can fix up the master template in the end (in parse.py)
     # Given we're half way through processing the template, we can't fix the master template here
     # we have to do it in post
-    if 'docx_subdocs' not in this_thread.misc:
-        this_thread.misc['docx_subdocs'] = []
-    this_thread.misc['docx_subdocs'].append({'subdoc': deepcopy(sd.subdocx), 'change_numbering': change_numbering})
+    if 'docx_subdocs' not in docassemble.base.functions.this_thread.misc:
+        docassemble.base.functions.this_thread.misc['docx_subdocs'] = []
+    docassemble.base.functions.this_thread.misc['docx_subdocs'].append({'subdoc': deepcopy(sd.subdocx), 'change_numbering': change_numbering})
 
     # Fix the subdocs before they are included in the template
-    fix_subdoc(this_thread.misc['docx_template'], {'subdoc': sd.subdocx, 'change_numbering': change_numbering})
+    fix_subdoc(docassemble.base.functions.this_thread.misc['docx_template'], {'subdoc': sd.subdocx, 'change_numbering': change_numbering})
 
     first_paragraph = sd.subdocx.paragraphs[0]
 
@@ -173,9 +174,9 @@ def include_docx_template(template_file, **kwargs):
         else:
             the_repr = '_codecs.decode(_array.array("b", "' + re.sub(r'\n', '', codecs.encode(bytearray(val, encoding='utf-8'), 'base64').decode()) + '".encode()), "base64").decode()'
         first_paragraph.insert_paragraph_before(str("{%%p set %s = %s %%}" % (key, the_repr)))
-    if 'docx_include_count' not in this_thread.misc:
-        this_thread.misc['docx_include_count'] = 0
-    this_thread.misc['docx_include_count'] += 1
+    if 'docx_include_count' not in docassemble.base.functions.this_thread.misc:
+        docassemble.base.functions.this_thread.misc['docx_include_count'] = 0
+    docassemble.base.functions.this_thread.misc['docx_include_count'] += 1
     if single_paragraph:
         return re.sub(r'<w:p[^>]*>\s*(.*)</w:p>\s*', r'\1', str(first_paragraph._p.xml), flags=re.DOTALL)
     return sd

docassemble_base/docassemble/base/sql.py

@@ -4,7 +4,8 @@
 import json
 import sqlalchemy
 from docassemble.base.logger import logmessage
-from docassemble.base.functions import server, this_thread
+import docassemble.base.functions
+from docassemble.base.functions import server
 from docassemble.base.util import DAList, DAObjectPlusParameters
 from docassemble.base.error import DAAttributeError, DAException
 from alembic.config import Config
@@ -72,17 +73,17 @@ def __setstate__(self, pickle_dict):
 
     @classmethod
     def filter(cls, instance_name, **kwargs):
-        if 'dbcache' not in this_thread.misc:
-            this_thread.misc['dbcache'] = {}
+        if 'dbcache' not in docassemble.base.functions.this_thread.misc:
+            docassemble.base.functions.this_thread.misc['dbcache'] = {}
         listobj = DAList(instance_name, object_type=cls, auto_gather=False)
         filters = []
         for key, val in kwargs.items():
             if not hasattr(cls._model, key):
                 raise DAException("filter: class " + cls.__name__ + " does not have column " + key)
             filters.append(getattr(cls._model, key) == val)
         for db_entry in list(cls._session.query(cls._model).filter(*filters).order_by(cls._model.id).all()):
-            if cls._model.__name__ in this_thread.misc['dbcache'] and db_entry.id in this_thread.misc['dbcache'][cls._model.__name__]:
-                listobj.append(this_thread.misc['dbcache'][cls._model.__name__][db_entry.id])
+            if cls._model.__name__ in docassemble.base.functions.this_thread.misc['dbcache'] and db_entry.id in docassemble.base.functions.this_thread.misc['dbcache'][cls._model.__name__]:
+                listobj.append(docassemble.base.functions.this_thread.misc['dbcache'][cls._model.__name__][db_entry.id])
             else:
                 obj = listobj.appendObject()
                 obj.id = db_entry.id
@@ -107,16 +108,16 @@ def any(cls):
 
     @classmethod
     def all(cls, instance_name=None):
-        if 'dbcache' not in this_thread.misc:
-            this_thread.misc['dbcache'] = {}
+        if 'dbcache' not in docassemble.base.functions.this_thread.misc:
+            docassemble.base.functions.this_thread.misc['dbcache'] = {}
         if instance_name:
             listobj = DAList(instance_name, object_type=cls)
         else:
             listobj = DAList(object_type=cls)
             listobj.set_random_instance_name()
         for db_entry in list(cls._session.query(cls._model).order_by(cls._model.id).all()):
-            if cls._model.__name__ in this_thread.misc['dbcache'] and db_entry.id in this_thread.misc['dbcache'][cls._model.__name__]:
-                listobj.append(this_thread.misc['dbcache'][cls._model.__name__][db_entry.id])
+            if cls._model.__name__ in docassemble.base.functions.this_thread.misc['dbcache'] and db_entry.id in docassemble.base.functions.this_thread.misc['dbcache'][cls._model.__name__]:
+                listobj.append(docassemble.base.functions.this_thread.misc['dbcache'][cls._model.__name__][db_entry.id])
             else:
                 obj = listobj.appendObject()
                 obj.id = db_entry.id
@@ -134,12 +135,12 @@ def all(cls, instance_name=None):
 
     @classmethod
     def by_id(cls, the_id, instance_name=None):
-        if 'dbcache' not in this_thread.misc:
-            this_thread.misc['dbcache'] = {}
-        if cls._model.__name__ in this_thread.misc['dbcache'] and the_id in this_thread.misc['dbcache'][cls._model.__name__]:
+        if 'dbcache' not in docassemble.base.functions.this_thread.misc:
+            docassemble.base.functions.this_thread.misc['dbcache'] = {}
+        if cls._model.__name__ in docassemble.base.functions.this_thread.misc['dbcache'] and the_id in docassemble.base.functions.this_thread.misc['dbcache'][cls._model.__name__]:
             if instance_name is None:
-                return this_thread.misc['dbcache'][cls._model.__name__][the_id]
-            obj = this_thread.misc['dbcache'][cls._model.__name__][the_id]
+                return docassemble.base.functions.this_thread.misc['dbcache'][cls._model.__name__][the_id]
+            obj = docassemble.base.functions.this_thread.misc['dbcache'][cls._model.__name__][the_id]
             obj.fix_instance_name(obj.instanceName, instance_name)
         if instance_name is None:
             obj = cls(id=the_id)
@@ -169,8 +170,8 @@ def by_uid(cls, uid, instance_name=None):
     def delete_by_id(cls, the_id):
         cls._session.query(cls._model).filter(cls._model.id == the_id).delete()
         cls._session.commit()
-        if 'dbcache' in this_thread.misc and cls._model.__name__ in this_thread.misc['dbcache'] and the_id in this_thread.misc['dbcache'][cls._model.__name__]:
-            this_thread.misc['dbcache'][cls._model.__name__][the_id]._zombie = True
+        if 'dbcache' in docassemble.base.functions.this_thread.misc and cls._model.__name__ in docassemble.base.functions.this_thread.misc['dbcache'] and the_id in docassemble.base.functions.this_thread.misc['dbcache'][cls._model.__name__]:
+            docassemble.base.functions.this_thread.misc['dbcache'][cls._model.__name__][the_id]._zombie = True
 
     @classmethod
     def delete_by_uid(cls, uid):
@@ -181,8 +182,8 @@ def delete_by_uid(cls, uid):
             the_id = db_entry.id
             cls._session.query(cls._model).filter(getattr(cls._model, cls._uid) == uid).delete()
             cls._session.commit()
-            if 'dbcache' in this_thread.misc and cls._model.__name__ in this_thread.misc['dbcache'] and the_id in this_thread.misc['dbcache'][cls._model.__name__]:
-                this_thread.misc['dbcache'][cls._model.__name__][the_id]._zombie = True
+            if 'dbcache' in docassemble.base.functions.this_thread.misc and cls._model.__name__ in docassemble.base.functions.this_thread.misc['dbcache'] and the_id in docassemble.base.functions.this_thread.misc['dbcache'][cls._model.__name__]:
+                docassemble.base.functions.this_thread.misc['dbcache'][cls._model.__name__][the_id]._zombie = True
 
     @classmethod
     def id_exists(cls, the_id):
@@ -201,25 +202,25 @@ def uid_exists(cls, uid):
         return True
 
     def db_from_cache(self, the_id):
-        if 'dbcache' not in this_thread.misc:
-            this_thread.misc['dbcache'] = {}
-        if self._model.__name__ not in this_thread.misc['dbcache']:
-            this_thread.misc['dbcache'][self._model.__name__] = {}
-        if the_id in this_thread.misc['dbcache'][self._model.__name__]:
-            return this_thread.misc['dbcache'][self._model.__name__][the_id]
+        if 'dbcache' not in docassemble.base.functions.this_thread.misc:
+            docassemble.base.functions.this_thread.misc['dbcache'] = {}
+        if self._model.__name__ not in docassemble.base.functions.this_thread.misc['dbcache']:
+            docassemble.base.functions.this_thread.misc['dbcache'][self._model.__name__] = {}
+        if the_id in docassemble.base.functions.this_thread.misc['dbcache'][self._model.__name__]:
+            return docassemble.base.functions.this_thread.misc['dbcache'][self._model.__name__][the_id]
         return None
 
     def db_cache(self):
-        if 'dbcache' not in this_thread.misc:
-            this_thread.misc['dbcache'] = {}
-        if self._model.__name__ not in this_thread.misc['dbcache']:
-            this_thread.misc['dbcache'][self._model.__name__] = {}
+        if 'dbcache' not in docassemble.base.functions.this_thread.misc:
+            docassemble.base.functions.this_thread.misc['dbcache'] = {}
+        if self._model.__name__ not in docassemble.base.functions.this_thread.misc['dbcache']:
+            docassemble.base.functions.this_thread.misc['dbcache'][self._model.__name__] = {}
         if hasattr(self, 'id'):
-            this_thread.misc['dbcache'][self._model.__name__][self.id] = self
+            docassemble.base.functions.this_thread.misc['dbcache'][self._model.__name__][self.id] = self
 
     def __del__(self):
-        if hasattr(self, 'id') and 'dbcache' in this_thread.misc and self._model.__name__ in this_thread.misc['dbcache'] and self.id in this_thread.misc['dbcache'][self._model.__name__]:
-            del this_thread.misc['dbcache'][self._model.__name__][self.id]
+        if hasattr(self, 'id') and 'dbcache' in docassemble.base.functions.this_thread.misc and self._model.__name__ in docassemble.base.functions.this_thread.misc['dbcache'] and self.id in docassemble.base.functions.this_thread.misc['dbcache'][self._model.__name__]:
+            del docassemble.base.functions.this_thread.misc['dbcache'][self._model.__name__][self.id]
 
     def db_delete(self):
         self.db_read()

docassemble_base/docassemble/base/standardformatter.py

@@ -2427,7 +2427,7 @@ def as_html(status, debug, root, validation_rules, field_error, the_progress_bar
                   <div class="card-body">
                     <form aria-labelledby="daheadingOne" action=\"""" + root + """\" id="daemailform" class="form-horizontal" method="POST">
                       <input type="hidden" name="_question_name" value=""" + json.dumps(status.question.name, ensure_ascii=False) + """/>
-                      <div class="da-form-group row"><label for="da_attachment_email_address" class="col-""" + daconfig['grid classes']['label width'] + """ col-form-label da-form-label datext-right">""" + word('E-mail address') + """</label><div class="col-""" + daconfig['grid classes']['field width'] + """"><input alt=""" + fix_double_quote(word("Input box")) + """ class="form-control" type="email" name="_attachment_email_address" id="da_attachment_email_address" value=""" + fix_double_quote(str(default_email)) + """/></div></div>"""
+                      <div class="da-form-group row"><label for="da_attachment_email_address" class="col-""" + daconfig['grid classes']['label width'] + ' col-form-label da-form-label datext-right">' + word('E-mail address') + '</label><div class="col-' + daconfig['grid classes']['field width'] + '"><input alt=' + fix_double_quote(word("Input box")) + ' class="form-control" type="email" name="_attachment_email_address" id="da_attachment_email_address" value=' + fix_double_quote(str(default_email)) + '/></div></div>'
                 if editable_included:
                     if automatically_include_editable:
                         output += """