docassemble.AssemblyLine 2.26.0__tar.gz → 2.27.0__tar.gz

{docassemble.AssemblyLine-2.26.0/docassemble.AssemblyLine.egg-info → docassemble.AssemblyLine-2.27.0}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: docassemble.AssemblyLine
-Version: 2.26.0
+Version: 2.27.0
 Home-page: https://courtformsonline.org
 Author: Suffolk Legal Innovation and Technology Lab
 Author-email: qsteenhuis@suffolk.edu
 License: The MIT License (MIT)
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: docassemble.ALToolbox>=0.8.1
+Requires-Dist: docassemble.ALToolbox>=0.8.3
 Requires-Dist: docassemble.GithubFeedbackForm>=0.2.1
 
 # Suffolk LIT Lab Document Assembly Line

docassemble.AssemblyLine-2.27.0/docassemble/AssemblyLine/__init__.py

@@ -0,0 +1 @@
+__version__ = '2.27.0'

{docassemble.AssemblyLine-2.26.0 → docassemble.AssemblyLine-2.27.0}/docassemble/AssemblyLine/al_courts.py

@@ -4,6 +4,7 @@ Package for a very simple / MVP list of courts that is mostly signature compatib
 import os
 from typing import Any, Dict, List, Optional, Union, Set
 import pandas as pd
+import docassemble.base.functions
 from docassemble.base.util import (
     path_and_mimetype,
     Address,
@@ -205,6 +206,7 @@ class ALCourtLoader(DAObject):
 
     def init(self, *pargs, **kwargs):
         super().init(*pargs, **kwargs)
+        self.package = docassemble.base.functions.this_thread.current_question.package
         if not hasattr(self, "filename"):
             self.filename = (
                 self.file_name
@@ -416,11 +418,15 @@ class ALCourtLoader(DAObject):
         """
         if not hasattr(self, "filename") and hasattr(self, "file_name"):
             self.filename = self.file_name
-        if "/" in self.filename:
-            to_load = path_and_mimetype(self.filename)[0]
+        if ":" not in self.filename and hasattr(self, "package"):
+            load_path = self.package + ":"
+            if "/" not in str(self.filename):
+                load_path += "data/sources/"
+            load_path += str(self.filename)
         else:
-            to_load = path_and_mimetype(os.path.join("data/sources", self.filename))[0]
+            load_path = str(self.filename)
 
+        to_load = path_and_mimetype(load_path)[0]
         if self.filename.lower().endswith(".xlsx"):
             df = pd.read_excel(to_load)
         elif self.filename.lower().endswith(".csv"):

{docassemble.AssemblyLine-2.26.0 → docassemble.AssemblyLine-2.27.0}/docassemble/AssemblyLine/al_document.py

@@ -3,6 +3,8 @@ import os
 import mimetypes
 from typing import Any, Dict, List, Union, Callable, Optional
 from docassemble.base.util import (
+    Address,
+    LatitudeLongitude,
     log,
     DADict,
     DAList,
@@ -116,14 +118,22 @@ def safeattr(object: Any, key: str) -> str:
 
     Returns:
         str: The retrieved value or an empty string if not found or if an error occurred.
+
+    Note:
+        The `location` attribute of an Address object or any LatitudeLongitude attribute of a DAObject is always skipped.
     """
     try:
         if isinstance(object, dict) or isinstance(object, DADict):
             return str(object.get(key, ""))
         elif isinstance(object, DAObject):
             # `location` is not an attribute people usually want shown in the table of people's attributes
-            if key == "location":
+            if key == "location" and isinstance(object, Address):
                 return ""
+            elif key == "location" and isinstance(object, DAObject):
+                if hasattr(object, "location") and isinstance(
+                    object.location, LatitudeLongitude
+                ):
+                    return ""
             return str(getattr(object, key))
         else:
             return ""
@@ -512,6 +522,9 @@ class ALAddendumField(DAObject):
 
         Returns:
             Optional[list]: A list of columns or None if no meaningful columns can be determined.
+
+        Note:
+            The "location" attribute of an Address object is always skipped in the column list.
         """
         if not skip_attributes:
             skip_attributes = {"complete"}
@@ -2078,7 +2091,8 @@ class ALDocumentBundle(DAList):
             show_editable_checkbox (bool, optional): Flag indicating if the checkbox
                 for deciding the inclusion of an editable (Word) copy should be displayed.
                 Defaults to True.
-            template_name (str, optional): The name of the template to be used. Defaults to an empty string.
+            template_name (str, optional): Name of the template variable that is used to fill
+                the email contents. By default, the `x.send_email_template` template will be used.
 
         Returns:
             str: The generated HTML string for the input box and button.

{docassemble.AssemblyLine-2.26.0 → docassemble.AssemblyLine-2.27.0}/docassemble/AssemblyLine/al_general.py

@@ -24,6 +24,7 @@ from docassemble.base.util import (
     name_suffix,
     phone_number_formatted,
     phone_number_is_valid,
+    showifdef,
     state_name,
     states_list,
     subdivision_type,
@@ -150,6 +151,10 @@ class ALAddress(Address):
         # differs from the server's country.
         if country_code and country_code != get_country() and not show_country:
             self.country = country_code
+        # Priority order for country: already answered country, passed in country_code, then get_country
+        prev_selected_country = showifdef(self.attr_name("country"), None, prior=True)
+        if prev_selected_country:
+            country_code = prev_selected_country
         if not country_code:
             country_code = get_country()
         if allow_no_address:
@@ -193,7 +198,7 @@ class ALAddress(Address):
 
         fields.append({"label": str(self.city_label), "field": self.attr_name("city")})
 
-        if country_code:
+        if country_code and not show_country:
             fields.append(
                 {
                     "label": str(self.state_label),
@@ -202,15 +207,15 @@ class ALAddress(Address):
                     "default": default_state if default_state else "",
                 }
             )
-        else:  # not showing country and not showing country code
+        else:  # when you are allowed to change country
             fields.append(
                 {
-                    "label": str(self.state_label),
+                    "label": str(self.state_or_province_label),
                     "field": self.attr_name("state"),
                     "default": default_state if default_state else "",
                 }
             )
-        if country_code == "US":
+        if country_code == "US" and not show_country:
             fields.append(
                 {
                     "label": str(self.zip_label),
@@ -521,7 +526,7 @@ class ALAddress(Address):
 
         Args:
             include_unit (bool): If True, includes the unit in the formatted address. Defaults to True.
-            omit_default_country (bool): If True, omits the default country from the formatted address. Defaults to True.
+            omit_default_country (bool): If True, doesn't show the Docassemble default country in the formatted address. Defaults to True.
             language (str, optional): Language for the address format.
             show_country (bool, optional): If True, includes the country in the formatted address.
                 If None, decides based on the country attribute.
@@ -843,26 +848,24 @@ class ALIndividual(Individual):
         """
         nums = []
         if hasattr(self, "mobile_number") and self.mobile_number:
+            fmt_number = None
             try:
-                nums.append(
-                    {
-                        phone_number_formatted(
-                            self.mobile_number, country=country
-                        ): "cell"
-                    }
-                )
+                fmt_number = phone_number_formatted(self.mobile_number, country=country)
             except:
+                fmt_number = None
+            if fmt_number:
+                nums.append({fmt_number: "cell"})
+            else:
                 nums.append({self.mobile_number: "cell"})
         if hasattr(self, "phone_number") and self.phone_number:
+            fmt_number = None
             try:
-                nums.append(
-                    {
-                        phone_number_formatted(
-                            self.phone_number, country=country
-                        ): "other"
-                    }
-                )
+                fmt_number = phone_number_formatted(self.phone_number, country=country)
             except:
+                fmt_number = None
+            if fmt_number:
+                nums.append({fmt_number: "other"})
+            else:
                 nums.append({self.phone_number: "other"})
         if len(nums) < 1:
             return ""
@@ -873,10 +876,7 @@ class ALIndividual(Individual):
             return str(self.impounded_phone_output_label)
         elif len(nums) > 1:
             return comma_list(
-                [
-                    list(num.keys())[0] + " (" + list(num.values())[0] + ")"
-                    for num in nums
-                ]
+                [f"{list(num.keys())[0]} ({list(num.values())[0]})" for num in nums]
             )
         elif len(nums):
             return list(nums[0].keys())[0]

{docassemble.AssemblyLine-2.26.0 → docassemble.AssemblyLine-2.27.0}/docassemble/AssemblyLine/data/questions/al_visual.yml

@@ -366,10 +366,18 @@ content: |
       MAIN_METADATA = next(iter(interview_metadata.values())) 
     %>
   % else:
-    <% MAIN_METADATA = {} %>
+    <% MAIN_METADATA = all_variables(special='metadata') %>
   % endif
-  % if MAIN_METADATA.get("original_form") and not MAIN_METADATA.get("original_form", "").strip() == "None" and MAIN_METADATA.get("original_form").startswith("http"):
-  [View the original version of this form](${ MAIN_METADATA.get("original_form") }).
+  <% ORIGINAL_FORMS = MAIN_METADATA.get("original_form", []) if isinstance(MAIN_METADATA.get("original_form"), list) else ([MAIN_METADATA.get("original_form", "")] if MAIN_METADATA.get("original_form") else []) %>
+
+  % if len(ORIGINAL_FORMS) > 1:
+  View the original version of this form at the links below:
+
+  % for url in [url for url in ORIGINAL_FORMS if url.strip() != "None" and url.startswith("http")]:
+  * [${ url }](${ url })
+  % endfor
+  % elif len(ORIGINAL_FORMS) == 1:
+  [View the original version of this form](${ ORIGINAL_FORMS[0] }).
   % endif
   
   % if package_updated_on:
@@ -426,8 +434,10 @@ continue button field: al_exit_logout_confirmation
 metadata:
   error action: al_custom_error_action
 ---
+# Only necessary to ignore playground "undefined names" warning
 objects:
   - MAIN_METADATA: DAEmpty()
+  - ORIGINAL_FORMS: DAEmpty()
 ---
 id: custom error action
 event: al_custom_error_action
@@ -445,8 +455,9 @@ subquestion: |
       MAIN_METADATA = next(iter(interview_metadata.values())) 
     %>
   % else:
-    <% MAIN_METADATA = {} %>
+    <% MAIN_METADATA = all_variables(special='metadata') %>
   % endif
+  <% ORIGINAL_FORMS = MAIN_METADATA.get("original_form", []) if isinstance(MAIN_METADATA.get("original_form"), list) else ([MAIN_METADATA.get("original_form", "")] if MAIN_METADATA.get("original_form") else []) %>
 
   We ran into an error when we tried to load this screen.
 
@@ -459,8 +470,13 @@ subquestion: |
   % if al_enable_incomplete_downloads:
   * Try to [download your work in progress](${ url_action("al_error_action_download_screen") })
   % endif
-  % if MAIN_METADATA.get("original_form") and not MAIN_METADATA.get("original_form", "").strip() == "None":
-  * [Download a blank "${ all_variables(special='metadata').get("title", "").strip() }"](${ MAIN_METADATA.get("original_form") } )
+  % if len(ORIGINAL_FORMS) > 1:
+  * Download a blank "${ all_variables(special='metadata').get("title", "").strip() }":
+  % for url in ORIGINAL_FORMS:
+      * [${ url }](${ url } )
+  % endfor
+  % elif len(ORIGINAL_FORMS) == 1:
+  * [Download a blank "${ all_variables(special='metadata').get("title", "").strip() }"]( ${ ORIGINAL_FORMS[0] })
   % endif
   * Visit the [${ AL_ORGANIZATION_TITLE } home page](${ AL_ORGANIZATION_HOMEPAGE }) and try another interview
   % if al_show_email_to_user_on_errors and get_config("error notification email"):