Merge branch 'main' into UCO-Feature-Issue-596

ucoProject · Oct 11, 2024 · e82a00f · e82a00f
2 parents c8895ad + 4f5050c
commit e82a00f
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,6 +26,11 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version:
+          - '3.9'
+          - '3.12'
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/supply-chain.yml b/.github/workflows/supply-chain.yml
@@ -28,8 +28,8 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - '3.8'
-          - '3.11'
+          - '3.9'
+          - '3.12'
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,10 +1,10 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 24.4.2
+    rev: 24.10.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/flake8
-    rev: 7.1.0
+    rev: 7.1.1
     hooks:
       - id: flake8
   - repo: https://github.com/pycqa/isort

diff --git a/dependencies/CDO-Shapes-gufo b/dependencies/CDO-Shapes-gufo
diff --git a/ontology/uco-gufo.ttl b/ontology/uco-gufo.ttl
@@ -212,6 +212,32 @@ drafting:Velocity
 	rdfs:seeAlso <https://github.com/ucoProject/UCO/issues/567> ;
 	.
 
+drafting:hadParticipant
+	a
+		owl:ObjectProperty ,
+		gufo:MaterialRelationshipType
+		;
+	rdfs:subPropertyOf [
+		owl:inverseOf gufo:participatedIn ;
+	] ;
+	rdfs:domain drafting:Perdurant ;
+	rdfs:range drafting:Endurant ;
+	rdfs:seeAlso <https://github.com/ucoProject/UCO/issues/544> ;
+	.
+
+drafting:hadPerdurantProperPart
+	a
+		owl:ObjectProperty ,
+		gufo:MaterialRelationshipType
+		;
+	rdfs:subPropertyOf [
+		owl:inverseOf gufo:isEventProperPartOf ;
+	] ;
+	rdfs:domain drafting:Perdurant ;
+	rdfs:range drafting:Perdurant ;
+	rdfs:seeAlso <https://github.com/ucoProject/UCO/issues/544> ;
+	.
+
 drafting:isBearerOf
 	a owl:ObjectProperty ;
 	rdfs:domain gufo:ConcreteIndividual ;
@@ -230,13 +256,43 @@ uco-action:endTime
 		;
 	.
 
+uco-action:instrument
+	a gufo:MaterialRelationshipType ;
+	rdfs:subPropertyOf drafting:hadParticipant ;
+	.
+
+uco-action:object
+	a gufo:MaterialRelationshipType ;
+	rdfs:subPropertyOf drafting:hadParticipant ;
+	.
+
+uco-action:participant
+	a gufo:MaterialRelationshipType ;
+	rdfs:subPropertyOf drafting:hadParticipant ;
+	.
+
+uco-action:performer
+	a gufo:MaterialRelationshipType ;
+	rdfs:subPropertyOf drafting:hadParticipant ;
+	.
+
+uco-action:result
+	a gufo:MaterialRelationshipType ;
+	rdfs:subPropertyOf drafting:hadParticipant ;
+	.
+
 uco-action:startTime
 	rdfs:seeAlso
 		gufo:hasBeginPoint ,
 		gufo:hasBeginPointInXSDDateTimeStamp
 		;
 	.
 
+uco-action:subaction
+	a gufo:MaterialRelationshipType ;
+	rdfs:subPropertyOf drafting:hadPerdurantProperPart ;
+	.
+
 uco-analysis:AnalyticResult
 	a gufo:SubKind ;
 	.

diff --git a/tests/exemplars.ttl b/tests/exemplars.ttl
@@ -31,6 +31,25 @@ kb:Action-13c91d40-9ca0-4558-81a1-4f7db888c371
 	uco-action:startTime "2020-01-02T03:04:05Z"^^xsd:dateTime ;
 	.
 
+kb:Action-3bf63503-51e7-49bc-b7c2-fc2ed0c811a2
+	a uco-action:Action ;
+	uco-action:instrument kb:Camera-1c9a2999-b34c-459b-b983-113c7b9e71df ;
+	uco-action:object kb:Device-f28f07fa-0c36-486e-b957-750d183e5851 ;
+	uco-action:participant kb:Person-ee7130a7-0fec-48df-8312-4da1a214bd59 ;
+	uco-action:performer kb:Person-799c0b1d-2259-4438-b282-168060b3cb57 ;
+	uco-action:result kb:File-9a36db96-b6ee-49e6-a976-046a95a072a0 ;
+	uco-core:description "A photographer and assistant use a camera to photograph a device." ;
+	.
+
+kb:Action-8d1de002-78d4-4dd5-8841-653bb229d3bb
+	a uco-action:Action ;
+	uco-action:subaction kb:Action-8e371326-10db-4ecf-adb5-e9220b07694b ;
+	.
+
+kb:Action-8e371326-10db-4ecf-adb5-e9220b07694b
+	a uco-action:Action ;
+	.
+
 kb:AlternateDataStream-e6ceee40-5614-4740-b08c-d21ce9b2356d
 	a
 		uco-observable:AlternateDataStream ,
@@ -61,6 +80,11 @@ kb:BluetoothAddressFacet-717b8cce-e9c2-4d59-81e4-1747d7e2d8ee
 	a uco-observable:BluetoothAddressFacet ;
 	.
 
+kb:Camera-1c9a2999-b34c-459b-b983-113c7b9e71df
+	a uco-observable:Device ;
+	rdfs:comment "A digital, non-phone camera."@en ;
+	.
+
 kb:Compiler-7ae00fea-f392-4da5-9b07-ea0ee12e27ed
 	a drafting:Compiler ;
 	.
@@ -86,6 +110,11 @@ kb:DeploymentScript-6a4ce3a2-afbe-4680-9609-3b68af8965ff
 	a drafting:DeploymentScript ;
 	.
 
+kb:Device-f28f07fa-0c36-486e-b957-750d183e5851
+	a uco-observable:Device ;
+	rdfs:comment "A subject device that was photographed."@en ;
+	.
+
 kb:Event-03a1a1db-0579-4427-9a51-448c32281146
 	a uco-core:Event ;
 	gufo:hasBeginPointInXSDDateTimeStamp "2010-01-02T03:04:05Z"^^xsd:dateTimeStamp ;
@@ -94,6 +123,11 @@ kb:Event-03a1a1db-0579-4427-9a51-448c32281146
 	uco-core:startTime "2010-01-02T03:04:05Z"^^xsd:dateTime ;
 	.
 
+kb:File-9a36db96-b6ee-49e6-a976-046a95a072a0
+	a uco-observable:RasterPicture ;
+	rdfs:comment "TODO - At the time of this writing, File and its subclasses need alignment with gUFO."@en ;
+	.
+
 kb:Hash-4c3d0623-d365-4c69-a1a1-01523c6502fa
 	a
 		gufo:QualityValue ,
@@ -147,6 +181,14 @@ kb:Person-0c9728af-7f52-400e-9861-72cd11f6966a
 	a uco-identity:Person ;
 	.
 
+kb:Person-799c0b1d-2259-4438-b282-168060b3cb57
+	a uco-identity:Person ;
+	.
+
+kb:Person-ee7130a7-0fec-48df-8312-4da1a214bd59
+	a uco-identity:Person ;
+	.
+
 kb:Quality-4b765c1f-362c-4562-a50f-7bb781fe4737
 	a drafting:Quality ;
 	gufo:hasReifiedQualityValue kb:Hash-4c3d0623-d365-4c69-a1a1-01523c6502fa ;