clinicedc 2.0.4__py3-none-any.whl → 2.0.6__py3-none-any.whl

edc_pharmacy/model_mixins/study_medication_crf_model_mixin.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Tuple
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
@@ -88,7 +88,7 @@ class StudyMedicationCrfModelMixin(PreviousNextModelMixin, StudyMedicationRefill
 
         super().save(*args, **kwargs)
 
-    def creates_refills_from_crf(self) -> Tuple[RxRefill, RxRefill | None]:
+    def creates_refills_from_crf(self) -> tuple[RxRefill, RxRefill | None]:
         """Attribute called in signal"""
         return create_refills_from_crf(self, self.related_visit_model_attr())
 

edc_pharmacy/models/medication/formulation.py

@@ -25,7 +25,6 @@ class Manager(models.Manager):
 
 
 class Formulation(BaseUuidModel):
-
     medication = models.ForeignKey(Medication, on_delete=PROTECT, null=True, blank=False)
 
     strength = models.DecimalField(max_digits=6, decimal_places=1)
@@ -36,13 +35,13 @@ class Formulation(BaseUuidModel):
 
     route = models.ForeignKey(Route, on_delete=PROTECT)
 
-    notes = models.TextField(max_length=250, null=True, blank=True)
+    notes = models.TextField(max_length=250, default="", blank=True)
 
-    description = models.CharField(max_length=250, null=True, blank=True)
+    description = models.CharField(max_length=250, default="", blank=True)
 
     imp = models.BooleanField(default=False)
 
-    imp_description = models.CharField(max_length=250, null=True, blank=True)
+    imp_description = models.CharField(max_length=250, default="", blank=True)
 
     objects = Manager()
 

edc_pharmacy/models/medication/medication.py

@@ -12,12 +12,11 @@ class Manager(models.Manager):
 
 
 class Medication(BaseUuidModel):
-
     name = models.CharField(max_length=35, unique=True)
 
     display_name = models.CharField(max_length=50, unique=True)
 
-    notes = models.TextField(max_length=250, null=True, blank=True)
+    notes = models.TextField(max_length=250, default="", blank=True)
 
     objects = Manager()
 

edc_pharmacy/models/prescription/rx.py

@@ -98,7 +98,7 @@ class Rx(
         return f"{self.subject_identifier}"
 
     def natural_key(self):
-        return (self.rx_identifier,)  # noqa
+        return (self.rx_identifier,)
 
     def save(self, *args, **kwargs):
         self.registered_subject = RegisteredSubject.objects.get(
@@ -144,4 +144,4 @@ class Rx(
     class Meta(BaseUuidModel.Meta):
         verbose_name = "Prescription"
         verbose_name_plural = "Prescriptions"
-        indexes = [Index(fields=["rando_sid"])]
+        indexes = (Index(fields=["rando_sid"]),)

edc_pharmacy/models/prescription/rx_refill.py

@@ -102,7 +102,7 @@ class RxRefill(
 
     notes = models.TextField(
         max_length=250,
-        null=True,
+        default="",
         blank=True,
         help_text="Additional information for patient",
     )
@@ -137,7 +137,7 @@ class RxRefill(
         )
 
     def natural_key(self):
-        return (self.refill_identifier,)  # noqa
+        return (self.refill_identifier,)
 
     def save(self, *args, **kwargs):
         self.adjust_end_datetimes()
@@ -167,7 +167,7 @@ class RxRefill(
         ).dosage
         if self.roundup_dose:
             return math.ceil(dosage)
-        elif self.round_dose:
+        if self.round_dose:
             return round_half_away_from_zero(dosage, self.round_dose)
         return dosage
 
@@ -179,13 +179,11 @@ class RxRefill(
             return (
                 math.ceil(
                     (
-                        (
-                            float(self.get_dose())
-                            * float(self.frequency)
-                            * float(self.number_of_days)
-                        )
-                        / self.roundup_divisible_by
+                        float(self.get_dose())
+                        * float(self.frequency)
+                        * float(self.number_of_days)
                     )
+                    / self.roundup_divisible_by
                 )
                 * self.roundup_divisible_by
             )

edc_pharmacy/models/reports/stock_availability.py

@@ -4,8 +4,7 @@ from edc_qareports.model_mixins import QaReportModelMixin, qa_reports_permission
 
 
 class StockAvailability(QaReportModelMixin, models.Model):
-
-    subject_identifier = models.CharField(max_length=50, null=True)
+    subject_identifier = models.CharField(max_length=50, default="")
 
     visit_code = models.DecimalField(max_digits=8, decimal_places=1, null=True)
 
@@ -15,9 +14,9 @@ class StockAvailability(QaReportModelMixin, models.Model):
 
     relative_days = models.IntegerField(null=True)
 
-    codes = models.TextField(null=True)
+    codes = models.TextField(default="")
 
-    bins = models.TextField(null=True)
+    bins = models.TextField(default="")
 
     class Meta(QaReportModelMixin.Meta):
         verbose_name = "Stock availability"

edc_pharmacy/models/stock/confirmation_at_site.py

@@ -15,11 +15,9 @@ class Manager(models.Manager):
 
 
 class ConfirmationAtSite(SiteModelMixin, BaseUuidModel):
-
     transfer_confirmation_identifier = models.CharField(
         max_length=36,
         unique=True,
-        null=True,
         blank=True,
         help_text="A sequential unique identifier set by the EDC",
     )
@@ -32,7 +30,7 @@ class ConfirmationAtSite(SiteModelMixin, BaseUuidModel):
         Location, on_delete=models.PROTECT, limit_choices_to={"site__isnull": False}
     )
 
-    comments = models.TextField(null=True, blank=True)
+    comments = models.TextField(default="", blank=True)
 
     objects = Manager()
 

edc_pharmacy/models/stock/order.py

@@ -13,7 +13,6 @@ class Manager(models.Manager):
 
 
 class Order(BaseUuidModel):
-
     order_identifier = models.CharField(
         max_length=36,
         unique=True,
@@ -40,7 +39,7 @@ class Order(BaseUuidModel):
         null=True,
         blank=False,
     )
-    comment = models.TextField(null=True, blank=True)
+    comment = models.TextField(default="", blank=True)
 
     sent = models.BooleanField(default=False)
 

edc_pharmacy/models/stock/receive.py

@@ -15,11 +15,10 @@ class Manager(models.Manager):
 
 
 class Receive(BaseUuidModel):
-
     receive_identifier = models.CharField(
         max_length=36,
         unique=True,
-        null=True,
+        default="",
         blank=True,
         help_text="A sequential unique identifier set by the EDC",
     )
@@ -46,11 +45,11 @@ class Receive(BaseUuidModel):
         blank=False,
     )
 
-    invoice_number = models.CharField(max_length=50, null=True, blank=True)
+    invoice_number = models.CharField(max_length=50, default="", blank=True)
 
     invoice_date = models.DateField(null=True, blank=True)
 
-    comment = models.TextField(null=True, blank=True)
+    comment = models.TextField(default="", blank=True)
 
     objects = Manager()
 

edc_pharmacy/models/stock/receive_item.py

@@ -18,7 +18,6 @@ class Manager(models.Manager):
 
 
 class ReceiveItem(BaseUuidModel):
-
     receive_item_identifier = models.CharField(
         max_length=36,
         unique=True,
@@ -66,9 +65,9 @@ class ReceiveItem(BaseUuidModel):
         help_text="Quantity x Container.Quantity, e.g. 10 x Bottle of 128 = 1280",
     )
 
-    reference = models.CharField(max_length=150, null=True, blank=True)
+    reference = models.CharField(max_length=150, default="", blank=True)
 
-    comment = models.TextField(null=True, blank=True)
+    comment = models.TextField(default="", blank=True)
 
     task_id = models.UUIDField(null=True)
 

edc_pharmacy/models/stock/stock.py

@@ -29,7 +29,6 @@ from .repack_request import RepackRequest
 
 
 class Stock(BaseUuidModel):
-
     stock_identifier = models.CharField(
         verbose_name="Internal stock identifier",
         max_length=36,
@@ -208,7 +207,7 @@ class Stock(BaseUuidModel):
         obj: Stock = self
         receive_item = self.receive_item
         while not receive_item:
-            obj = obj.from_stock  # noqa
+            obj = obj.from_stock
             receive_item = obj.receive_item
         return receive_item
 

edc_pharmacy/models/stock/stock_adjustment.py

@@ -15,7 +15,6 @@ class StockAdjustmentManager(models.Manager):
 
 
 class StockAdjustment(BaseUuidModel):
-
     stock = models.ForeignKey(
         Stock,
         # related_name="source_stock",
@@ -39,7 +38,7 @@ class StockAdjustment(BaseUuidModel):
         validators=[MinValueValidator(0)],
     )
 
-    reason = models.TextField(null=True)
+    reason = models.TextField(default="")
 
     objects = StockAdjustmentManager()
 

edc_pharmacy/models/stock/stock_request.py

@@ -87,7 +87,7 @@ class StockRequest(BaseUuidModel):
 
     subject_identifiers = models.TextField(
         verbose_name="Include ONLY these subjects in this request. (Usually left blank)",
-        null=True,
+        default="",
         blank=True,
         help_text=(
             "By adding subject identifiers in this box, only these subjects "
@@ -97,13 +97,13 @@ class StockRequest(BaseUuidModel):
 
     excluded_subject_identifiers = models.TextField(
         verbose_name="Exclude these subjects from this request. (Usually left blank)",
-        null=True,
+        default="",
         blank=True,
     )
 
     labels = models.TextField(
         verbose_name="Labels",
-        null=True,
+        default="",
         blank=True,
         help_text=(
             "A cell to capture and confirm printed/scanned labels related to this "
@@ -114,8 +114,7 @@ class StockRequest(BaseUuidModel):
     cancel = models.CharField(
         verbose_name="To cancel this request, type the word 'CANCEL' here and save the form:",
         max_length=6,
-        default=None,
-        null=True,
+        default="",
         blank=True,
     )
     status = models.CharField(

edc_pharmacy/models/storage/box.py

@@ -15,7 +15,7 @@ class Box(BaseUuidModel):
 
     name = models.CharField(max_length=25, unique=True)
 
-    description = models.TextField(null=True)
+    description = models.TextField(default="")
 
     shelf = models.ForeignKey(Shelf, on_delete=models.PROTECT, null=True)
 

edc_pharmacy/models/storage/items/container_model_mixin.py

@@ -19,7 +19,7 @@ class ContainerModelMixin(models.Model):
 
     box = models.ForeignKey(Box, on_delete=models.PROTECT, null=True)
 
-    description = models.TextField(null=True)
+    description = models.TextField(default="")
 
     contains_uniquely_identifiable_items = models.BooleanField(default=True)
 

edc_pharmacy/models/storage/room.py

@@ -15,7 +15,7 @@ class Room(BaseUuidModel):
 
     name = models.CharField(max_length=25, unique=True)
 
-    description = models.TextField(null=True)
+    description = models.TextField(default="")
 
     location = models.ForeignKey(Location, on_delete=models.PROTECT)
 

edc_pharmacy/models/storage/shelf.py

@@ -15,7 +15,7 @@ class Shelf(BaseUuidModel):
 
     name = models.CharField(max_length=25, unique=True)
 
-    description = models.TextField(null=True)
+    description = models.TextField(default="")
 
     room = models.ForeignKey(Room, on_delete=models.PROTECT)
 

edc_pharmacy/models/storage/utils.py

@@ -30,21 +30,20 @@ def repackage(
 ):
     if source_container.unit_qty - (source_container.unit_qty_out + unit_qty) < 0:
         raise InsufficientQuantityError()
-    else:
-        new_container = new_container_model_cls(
-            container_type=source_container.container_type,
-            medication_lot=source_container.medication_lot,
-            unit_qty=unit_qty,
-            unit_qty_out=0,
-            source_container=source_container,
-            box=box,
-            **kwargs,
-        )
-        new_container.unit_qty = unit_qty
-        new_container.save()
-        source_container.unit_qty_out += new_container.unit_qty
-        source_container.save()
-        source_container.refresh_from_db()
+    new_container = new_container_model_cls(
+        container_type=source_container.container_type,
+        medication_lot=source_container.medication_lot,
+        unit_qty=unit_qty,
+        unit_qty_out=0,
+        source_container=source_container,
+        box=box,
+        **kwargs,
+    )
+    new_container.unit_qty = unit_qty
+    new_container.save()
+    source_container.unit_qty_out += new_container.unit_qty
+    source_container.save()
+    source_container.refresh_from_db()
     return new_container, source_container
 
 
@@ -70,7 +69,7 @@ def repackage_for_subject(
         raise PackagingSubjectIdentifierMismatchError(
             f"Expected subject identifier. Subject is randomized. Got sid `{rando_sid}`."
         )
-    elif not randomization_list.allocated and subject_identifier:
+    if not randomization_list.allocated and subject_identifier:
         raise PackagingSubjectIdentifierMismatchError(
             "Did not expect subject identifier. SID has not been allocated. "
             f"Got sid `{rando_sid}`."

edc_pharmacy/prescribe/create_prescription.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
@@ -17,10 +17,10 @@ def create_prescription(
     subject_identifier: str,
     report_datetime: datetime,
     medication_names: list[str],
-    randomizer_name: Optional[str] = None,
-    site: Optional[Any] = None,
-    site_id: Optional[Any] = None,
-    apps: Optional[Any] = None,
+    randomizer_name: str | None = None,
+    site: Any | None = None,
+    site_id: Any | None = None,
+    apps: Any | None = None,
 ) -> Rx:
     """Creates a PrescriptionAction and Rx model instance"""
     site_id = site_id or site.id

edc_pharmacy/refill/refill_creator.py

@@ -137,7 +137,7 @@ class RefillCreator:
                     f"Got {self.subject_identifier} attempting "
                     f"refill on {self.refill_start_datetime_as_str}."
                 )
-            elif (
+            if (
                 rx.rx_expiration_date
                 and self.refill_start_datetime.date() > rx.rx_expiration_date
             ):

edc_pharmacy/sample_usb_printing/usb_printing.py

@@ -4,7 +4,7 @@ import usb.util
 from django.http import JsonResponse
 
 
-class FindDevices(object):
+class FindDevices:
     def __init__(self, class_):
         self._class = class_
 

edc_pharmacy/utils/__init__.py

@@ -32,6 +32,7 @@ __all__ = [
     "get_imp_schedule_names",
     "get_instock_and_nostock_data",
     "get_random_code",
+    "get_related_or_none",
     "get_rx_model_cls",
     "get_rxrefill_model_cls",
     "get_stock_for_location_df",
@@ -41,5 +42,4 @@ __all__ = [
     "transfer_stock",
     "update_previous_refill_end_datetime",
     "update_stock_instance",
-    "get_related_or_none",
 ]

edc_pharmacy/utils/confirm_stock.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
@@ -25,8 +25,8 @@ def confirm_stock(
 
     See also: confirm_stock_action
     """
-    stock_model_cls: Type[Stock] = django_apps.get_model("edc_pharmacy.stock")
-    confirmation_model_cls: Type[Confirmation] = django_apps.get_model(
+    stock_model_cls: type[Stock] = django_apps.get_model("edc_pharmacy.stock")
+    confirmation_model_cls: type[Confirmation] = django_apps.get_model(
         "edc_pharmacy.confirmation"
     )
     stock_codes = [s.strip() for s in stock_codes]

edc_pharmacy/utils/confirm_stock_at_site.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 from django.contrib import messages
@@ -37,14 +37,14 @@ def confirm_stock_at_site(
     See also: confirm_stock_action
     """
     confirmed_by = request.user.username
-    stock_model_cls: Type[Stock] = django_apps.get_model("edc_pharmacy.stock")
-    confirmation_at_site_model_cls: Type[ConfirmationAtSite] = django_apps.get_model(
+    stock_model_cls: type[Stock] = django_apps.get_model("edc_pharmacy.stock")
+    confirmation_at_site_model_cls: type[ConfirmationAtSite] = django_apps.get_model(
         "edc_pharmacy.confirmationatsite"
     )
-    confirmation_at_site_item_model_cls: Type[ConfirmationAtSiteItem] = django_apps.get_model(
+    confirmation_at_site_item_model_cls: type[ConfirmationAtSiteItem] = django_apps.get_model(
         "edc_pharmacy.confirmationatsiteitem"
     )
-    location_model_cls: Type[Location] = django_apps.get_model("edc_pharmacy.location")
+    location_model_cls: type[Location] = django_apps.get_model("edc_pharmacy.location")
 
     location = location_model_cls.objects.get(pk=location)
 
@@ -56,9 +56,10 @@ def confirm_stock_at_site(
     confirmed, already_confirmed, invalid = [], [], []
     stock_codes = [s.strip() for s in stock_codes]
     for stock_code in stock_codes:
-        if not stock_model_cls.objects.filter(code=stock_code).exists():
-            invalid.append(stock_code)
-        elif not stock_transfer.stocktransferitem_set.filter(stock__code=stock_code).exists():
+        if (
+            not stock_model_cls.objects.filter(code=stock_code).exists()
+            or not stock_transfer.stocktransferitem_set.filter(stock__code=stock_code).exists()
+        ):
             invalid.append(stock_code)
         else:
             try:

edc_pharmacy/utils/dispense.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 from django.contrib import messages
@@ -21,9 +21,9 @@ def dispense(
     dispensed_by: str,
     request: WSGIRequest,
 ) -> QuerySet[DispenseItem] | None:
-    stock_model_cls: Type[Stock] = django_apps.get_model("edc_pharmacy.stock")
-    dispense_model_cls: Type[Dispense] = django_apps.get_model("edc_pharmacy.dispense")
-    dispense_item_model_cls: Type[DispenseItem] = django_apps.get_model(
+    stock_model_cls: type[Stock] = django_apps.get_model("edc_pharmacy.stock")
+    dispense_model_cls: type[Dispense] = django_apps.get_model("edc_pharmacy.dispense")
+    dispense_item_model_cls: type[DispenseItem] = django_apps.get_model(
         "edc_pharmacy.dispenseitem"
     )
 
@@ -33,10 +33,7 @@ def dispense(
             messages.add_message(
                 request,
                 messages.ERROR,
-                (
-                    "Stock not allocated to subject. "
-                    f"Got {stock.code}. Dispensing cancelled."
-                ),
+                (f"Stock not allocated to subject. Got {stock.code}. Dispensing cancelled."),
             )
             assignment_mismatch = True
             break

edc_pharmacy/utils/format_qty.py

@@ -11,9 +11,9 @@ def format_qty(qty: Decimal, container: Container):
     qty = 0 if qty is None else qty
     if container.qty_decimal_places == 0:
         return str(int(qty))
-    elif container.qty_decimal_places == 1:
-        return "{:0.1f}".format(qty)
-    return "{:0.2f}".format(qty)
+    if container.qty_decimal_places == 1:
+        return f"{qty:0.1f}"
+    return f"{qty:0.2f}"
 
 
 __all__ = ["format_qty"]

edc_pharmacy/utils/get_codenames.py

@@ -19,7 +19,7 @@ def get_codenames(
                 app_name, model_name = label_lower.split(".")
                 if label_lower in exclude_models:
                     continue
-                elif label_lower in view_only_models:
+                if label_lower in view_only_models:
                     codenames.append(f"{app_name}.view_{model_name}")
                 else:
                     for prefix in ["view_", "add_", "change_", "delete_"]:

edc_pharmacy/utils/miscellaneous.py

@@ -11,4 +11,4 @@ def get_rx_model_cls():
     return django_apps.get_model("edc_pharmacy.rx")
 
 
-__all__ = ["get_rxrefill_model_cls", "get_rx_model_cls"]
+__all__ = ["get_rx_model_cls", "get_rxrefill_model_cls"]

edc_pharmacy/utils/process_repack_request.py

@@ -28,25 +28,24 @@ def process_repack_request(repack_request_id: UUID | None = None, username: str
     number_to_process = repack_request.requested_qty - repack_request.processed_qty
     if not getattr(repack_request.from_stock, "confirmation", None):
         raise RepackError("Source stock item not confirmed")
-    else:
-        stock_model_cls = repack_request.from_stock.__class__
-        for index in range(0, int(number_to_process)):
-            try:
-                stock_model_cls.objects.create(
-                    receive_item=None,
-                    qty_in=1,
-                    qty_out=0,
-                    qty=1,
-                    from_stock=repack_request.from_stock,
-                    container=repack_request.container,
-                    location=repack_request.from_stock.location,
-                    repack_request=repack_request,
-                    lot=repack_request.from_stock.lot,
-                    user_created=username,
-                    created=get_utcnow(),
-                )
-            except InsufficientStockError:
-                break
+    stock_model_cls = repack_request.from_stock.__class__
+    for index in range(0, int(number_to_process)):
+        try:
+            stock_model_cls.objects.create(
+                receive_item=None,
+                qty_in=1,
+                qty_out=0,
+                qty=1,
+                from_stock=repack_request.from_stock,
+                container=repack_request.container,
+                location=repack_request.from_stock.location,
+                repack_request=repack_request,
+                lot=repack_request.from_stock.lot,
+                user_created=username,
+                created=get_utcnow(),
+            )
+        except InsufficientStockError:
+            break
     repack_request.processed_qty = stock_model_cls.objects.filter(
         repack_request=repack_request
     ).count()

edc_pharmacy/utils/process_repack_request_queryset.py

@@ -18,7 +18,5 @@ def process_repack_request_queryset(
     for pk in repack_request_pks:
         run_task_sync_or_async(process_repack_request, repack_request_id=pk, username=username)
 
-    return None
-
 
 __all__ = ["process_repack_request_queryset"]

edc_pharmacy/utils/stock_request/bulk_create_stock_request_items.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from datetime import timezone
+from datetime import UTC
 from typing import TYPE_CHECKING
 
 import pandas as pd
@@ -38,7 +38,7 @@ def bulk_create_stock_request_items(
         rx = rx_model_cls.objects.get(registered_subject=registered_subject)
         visit_code = str(int(row["next_visit_code"]))
         visit_code_sequence = int(10 * row["next_visit_code"] % 1)
-        appt_datetime = row["next_appt_datetime"].replace(tzinfo=timezone.utc)
+        appt_datetime = row["next_appt_datetime"].replace(tzinfo=UTC)
         assignment = rx.get_assignment()
         next_id = get_next_value(stock_request_item_model_cls._meta.label_lower)
         request_item_identifier = f"{next_id:06d}"
@@ -63,7 +63,6 @@ def bulk_create_stock_request_items(
                 obj.save()
         stock_request.item_count = len(data)
         stock_request.save(update_fields=["item_count"])
-    return None
 
 
 __all__ = ["bulk_create_stock_request_items"]