Merge branch 'master' of https://github.com/inventree/InvenTree

docs/docs/start/docker_prod.md

@@ -61,7 +61,7 @@ The example docker compose file launches the following containers:
 | --- | --- |
 | inventree-db | PostgreSQL database |
 | inventree-server | Gunicorn web server |
-| invenrtee-worker | django-q background worker |
+| inventree-worker | django-q background worker |
 | inventree-proxy | nginx proxy server |
 | *inventree-cache* | *redis cache (optional)* |
 
@@ -91,7 +91,7 @@ This container uses the official [redis image](https://hub.docker.com/_/redis).
 
 !!! info "Redis on Docker"
     Docker adds an additional network layer - that might lead to lower performance than bare metal.
-    To optimise and configure your redis deployment follow the [official docker guide](https://redis.io/docs/getting-started/install-stack/docker/#configuration).
+    To optimize and configure your redis deployment follow the [official docker guide](https://redis.io/docs/getting-started/install-stack/docker/#configuration).
 
 !!! warning "Disabled by default"
     The *redis* container is not enabled in the default configuration. This is provided as an example for users wishing to use redis.
@@ -205,6 +205,9 @@ docker compose pull
 
 This ensures that the InvenTree containers will be running the latest version of the InvenTree source code.
 
+!!! tip "Docker Directory"
+    All `docker compose` commands must be performed in the same directory as the [docker-compose.yml file](#required-files)
+
 !!! info "Tagged Version"
     If you are targeting a particular "tagged" version of InvenTree, you may wish to edit the `INVENTREE_TAG` variable in the `.env` file before issuing the `docker compose pull` command
 

src/backend/InvenTree/InvenTree/conversion.py

@@ -134,12 +134,15 @@ def convert_physical_value(value: str, unit: str = None, strip_units=True):
     # If the value is specified strangely (e.g. as a fraction or a dozen), this can cause issues
     # So, we ensure that it is converted to a floating point value
     # If we wish to return a "raw" value, some trickery is required
-    if unit:
-        magnitude = ureg.Quantity(value.to(ureg.Unit(unit))).magnitude
-    else:
-        magnitude = ureg.Quantity(value.to_base_units()).magnitude
+    try:
+        if unit:
+            magnitude = ureg.Quantity(value.to(ureg.Unit(unit))).magnitude
+        else:
+            magnitude = ureg.Quantity(value.to_base_units()).magnitude
 
-    magnitude = float(ureg.Quantity(magnitude).to_base_units().magnitude)
+        magnitude = float(ureg.Quantity(magnitude).to_base_units().magnitude)
+    except Exception as exc:
+        raise ValidationError(_(f'Invalid quantity supplied ({exc})'))
 
     if strip_units:
         return magnitude

src/backend/InvenTree/InvenTree/sentry.py

@@ -10,7 +10,7 @@
 import sentry_sdk
 from sentry_sdk.integrations.django import DjangoIntegration
 
-from InvenTree.version import INVENTREE_SW_VERSION
+import InvenTree.version
 
 logger = logging.getLogger('inventree')
 
@@ -31,6 +31,7 @@ def sentry_ignore_errors():
         Http404,
         ValidationError,
         rest_framework.exceptions.AuthenticationFailed,
+        rest_framework.exceptions.NotAuthenticated,
         rest_framework.exceptions.PermissionDenied,
         rest_framework.exceptions.ValidationError,
     ]
@@ -47,12 +48,19 @@ def init_sentry(dsn, sample_rate, tags):
         traces_sample_rate=sample_rate,
         send_default_pii=True,
         ignore_errors=sentry_ignore_errors(),
-        release=INVENTREE_SW_VERSION,
+        release=InvenTree.version.INVENTREE_SW_VERSION,
+        environment='development' if InvenTree.version.isInvenTreeDevelopmentVersion() else 'production'
     )
 
     for key, val in tags.items():
         sentry_sdk.set_tag(f'inventree_{key}', val)
 
+    sentry_sdk.set_tag('api', InvenTree.version.inventreeApiVersion())
+    sentry_sdk.set_tag('platform', InvenTree.version.inventreePlatform())
+    sentry_sdk.set_tag('git_branch', InvenTree.version.inventreeBranch())
+    sentry_sdk.set_tag('git_commit', InvenTree.version.inventreeCommitHash())
+    sentry_sdk.set_tag('git_date', InvenTree.version.inventreeCommitDate())
+
 
 def report_exception(exc):
     """Report an exception to sentry.io"""

src/backend/InvenTree/InvenTree/settings.py

@@ -139,8 +139,8 @@
 
 # Cross Origin Resource Sharing (CORS) options
 
-# Only allow CORS access to API
-CORS_URLS_REGEX = r'^/api/.*$'
+# Only allow CORS access to API and media endpoints
+CORS_URLS_REGEX = r'^/(api|media|static)/.*$'
 
 # Extract CORS options from configuration file
 CORS_ORIGIN_ALLOW_ALL = get_boolean_setting(

src/backend/InvenTree/InvenTree/tests.py

@@ -104,6 +104,21 @@ def test_dimensionless_units(self):
             q = InvenTree.conversion.convert_physical_value(val)
             self.assertAlmostEqual(q, expected, 3)
 
+    def test_invalid_units(self):
+        """Test conversion with bad units"""
+
+        tests = {
+            '3': '10',
+            '13': '-?-',
+            '-3': 'xyz',
+            '-12': '-12',
+            '1/0': '1/0',
+        }
+
+        for val, unit in tests.items():
+            with self.assertRaises(ValidationError):
+                InvenTree.conversion.convert_physical_value(val, unit)
+
     def test_invalid_values(self):
         """Test conversion of invalid inputs"""