update GRIB/BUFR media types

tomkralidis · tomkralidis · commit 070b05117a69 · 2024-10-08T21:31:48.000-04:00
diff --git a/.github/workflows/test-data/example-message.json b/.github/workflows/test-data/example-message.json
@@ -23,7 +23,7 @@
     "links": [
         {
             "rel": "canonical",
-            "type": "application/x-bufr",
+            "type": "application/bufr",
             "href": "https://pywis-pubsub-test.s3.eu-central-1.amazonaws.com/WIGOS_0-454-2-AWSCHIKANGAWA_20221109T135500.bufr4",
             "length": 247
         }
diff --git a/.github/workflows/test-data/pub-config.yml b/.github/workflows/test-data/pub-config.yml
@@ -5,4 +5,4 @@ broker: mqtt://localhost:1883
 publish_topic: origin/a/wis2/mwi/malawi_wmo_demo/data/core/weather/surface-based-observations/synop
 
 # application-type of file being published
-content_type: application/x-bufr
+content_type: application/bufr
diff --git a/README.md b/README.md
@@ -182,7 +182,7 @@ from pywis_pubsub.publish import create_message
 
 message = create_message(
         topic='foo/bar',
-        content_type='application/x-bufr',
+        content_type='application/bufr',
         url='http://www.meteo.xx/stationXYZ-20221111085500.bufr4', 
         identifier='stationXYZ-20221111085500', 
         datetime_=datetime.now(timezone.utc),
diff --git a/pywis_pubsub/util.py b/pywis_pubsub/util.py
@@ -198,8 +198,8 @@ def guess_extension(media_type: str) -> str:
     extension = None
 
     wmo_extra_types = {
-        'application/x-bufr': '.bufr4',
-        'application/x-grib': '.grib2',
+        'application/bufr': '.bufr4',
+        'application/grib': '.grib2',
         'application/cap+xml': '.cap'
     }
 
diff --git a/tests/test_invalid.json b/tests/test_invalid.json
@@ -28,7 +28,7 @@
         {
             "href": "https://example.org/data/4Pubsub/92c557ef-d28e-4713-91af-2e2e7be6f8ab.bufr4",
             "rel": "canonical",
-            "type": "application/x-bufr"
+            "type": "application/bufr"
         }
     ]
 }
diff --git a/tests/test_invalid_datetime.json b/tests/test_invalid_datetime.json
@@ -28,7 +28,7 @@
         {
             "href": "https://example.org/data/4Pubsub/92c557ef-d28e-4713-91af-2e2e7be6f8ab.bufr4",
             "rel": "canonical",
-            "type": "application/x-bufr"
+            "type": "application/bufr"
         }
     ]
 }
diff --git a/tests/test_malformed.json b/tests/test_malformed.json
@@ -29,7 +29,7 @@
         {
             "href": "https://example.org/data/4Pubsub/92c557ef-d28e-4713-91af-2e2e7be6f8ab.bufr4",
             "rel": "canonical",
-            "type": "application/x-bufr"
+            "type": "application/bufr"
         }
     ]
 }
diff --git a/tests/test_valid.json b/tests/test_valid.json
@@ -29,7 +29,7 @@
         {
             "href": "https://example.org/data/4Pubsub/92c557ef-d28e-4713-91af-2e2e7be6f8ab.bufr4",
             "rel": "canonical",
-            "type": "application/x-bufr"
+            "type": "application/bufr"
         }
     ]
 }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`"links": [`
`24`	`24`	`{`
`25`	`25`	`"rel": "canonical",`
`26`		`- "type": "application/x-bufr",`
	`26`	`+ "type": "application/bufr",`
`27`	`27`	`"href": "https://pywis-pubsub-test.s3.eu-central-1.amazonaws.com/WIGOS_0-454-2-AWSCHIKANGAWA_20221109T135500.bufr4",`
`28`	`28`	`"length": 247`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -198,8 +198,8 @@ def guess_extension(media_type: str) -> str:`
`198`	`198`	`extension = None`
`199`	`199`
`200`	`200`	`wmo_extra_types = {`
`201`		`- 'application/x-bufr': '.bufr4',`
`202`		`- 'application/x-grib': '.grib2',`
	`201`	`+ 'application/bufr': '.bufr4',`
	`202`	`+ 'application/grib': '.grib2',`
`203`	`203`	`'application/cap+xml': '.cap'`
`204`	`204`	`}`
`205`	`205`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`{`
`29`	`29`	`"href": "https://example.org/data/4Pubsub/92c557ef-d28e-4713-91af-2e2e7be6f8ab.bufr4",`
`30`	`30`	`"rel": "canonical",`
`31`		`- "type": "application/x-bufr"`
	`31`	`+ "type": "application/bufr"`
`32`	`32`	`}`
`33`	`33`	`]`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`{`
`30`	`30`	`"href": "https://example.org/data/4Pubsub/92c557ef-d28e-4713-91af-2e2e7be6f8ab.bufr4",`
`31`	`31`	`"rel": "canonical",`
`32`		`- "type": "application/x-bufr"`
	`32`	`+ "type": "application/bufr"`
`33`	`33`	`}`
`34`	`34`	`]`
`35`	`35`	`}`