cartography 0.102.0rc1__py3-none-any.whl → 0.103.0__py3-none-any.whl

cartography/models/openai/user.py

@@ -0,0 +1,49 @@
+from dataclasses import dataclass
+
+from cartography.models.core.common import PropertyRef
+from cartography.models.core.nodes import CartographyNodeProperties
+from cartography.models.core.nodes import CartographyNodeSchema
+from cartography.models.core.relationships import CartographyRelProperties
+from cartography.models.core.relationships import CartographyRelSchema
+from cartography.models.core.relationships import LinkDirection
+from cartography.models.core.relationships import make_target_node_matcher
+from cartography.models.core.relationships import TargetNodeMatcher
+
+
+@dataclass(frozen=True)
+class OpenAIUserNodeProperties(CartographyNodeProperties):
+    object: PropertyRef = PropertyRef("object")
+    id: PropertyRef = PropertyRef("id")
+    name: PropertyRef = PropertyRef("name")
+    email: PropertyRef = PropertyRef("email", extra_index=True)
+    role: PropertyRef = PropertyRef("role")
+    added_at: PropertyRef = PropertyRef("added_at")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+class OpenAIUserToOrganizationRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+
+
+@dataclass(frozen=True)
+# (:OpenAIOrganization)-[:RESOURCE]->(:OpenAIUser)
+class OpenAIUserToOrganizationRel(CartographyRelSchema):
+    target_node_label: str = "OpenAIOrganization"
+    target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
+        {"id": PropertyRef("ORG_ID", set_in_kwargs=True)},
+    )
+    direction: LinkDirection = LinkDirection.INWARD
+    rel_label: str = "RESOURCE"
+    properties: OpenAIUserToOrganizationRelProperties = (
+        OpenAIUserToOrganizationRelProperties()
+    )
+
+
+@dataclass(frozen=True)
+class OpenAIUserSchema(CartographyNodeSchema):
+    label: str = "OpenAIUser"
+    properties: OpenAIUserNodeProperties = OpenAIUserNodeProperties()
+    sub_resource_relationship: OpenAIUserToOrganizationRel = (
+        OpenAIUserToOrganizationRel()
+    )

cartography/models/semgrep/dependencies.py

@@ -15,61 +15,69 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class SemgrepDependencyNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('id')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    name: PropertyRef = PropertyRef('name')
-    ecosystem: PropertyRef = PropertyRef('ecosystem')
-    version: PropertyRef = PropertyRef('version')
+    id: PropertyRef = PropertyRef("id")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    name: PropertyRef = PropertyRef("name")
+    ecosystem: PropertyRef = PropertyRef("ecosystem")
+    version: PropertyRef = PropertyRef("version")
 
 
 @dataclass(frozen=True)
 class SemgrepDependencyToSemgrepDeploymentRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:SemgrepDependency)<-[:RESOURCE]-(:SemgrepDeployment)
-class SemgrepDependencyToSemgrepDeploymentSchema(CartographyRelSchema):
-    target_node_label: str = 'SemgrepDeployment'
+class SemgrepDependencyToSemgrepDeploymentRel(CartographyRelSchema):
+    target_node_label: str = "SemgrepDeployment"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('DEPLOYMENT_ID', set_in_kwargs=True)},
+        {"id": PropertyRef("DEPLOYMENT_ID", set_in_kwargs=True)},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "RESOURCE"
-    properties: SemgrepDependencyToSemgrepDeploymentRelProperties = SemgrepDependencyToSemgrepDeploymentRelProperties()
+    properties: SemgrepDependencyToSemgrepDeploymentRelProperties = (
+        SemgrepDependencyToSemgrepDeploymentRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class SemgrepDependencyToGithubRepoRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    specifier: PropertyRef = PropertyRef('specifier')
-    transitivity: PropertyRef = PropertyRef('transitivity')
-    url: PropertyRef = PropertyRef('url')
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    specifier: PropertyRef = PropertyRef("specifier")
+    transitivity: PropertyRef = PropertyRef("transitivity")
+    url: PropertyRef = PropertyRef("url")
 
 
 @dataclass(frozen=True)
 # (:SemgrepDependency)<-[:REQUIRES]-(:GitHubRepository)
 class SemgrepDependencyToGithubRepoRel(CartographyRelSchema):
-    target_node_label: str = 'GitHubRepository'
+    target_node_label: str = "GitHubRepository"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('repo_url')},
+        {"id": PropertyRef("repo_url")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "REQUIRES"
-    properties: SemgrepDependencyToGithubRepoRelProperties = SemgrepDependencyToGithubRepoRelProperties()
+    properties: SemgrepDependencyToGithubRepoRelProperties = (
+        SemgrepDependencyToGithubRepoRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class SemgrepSCAFindngToDependencyRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 class SemgrepGoLibrarySchema(CartographyNodeSchema):
-    label: str = 'GoLibrary'
-    extra_node_labels: Optional[ExtraNodeLabels] = ExtraNodeLabels(['Dependency', 'SemgrepDependency'])
+    label: str = "GoLibrary"
+    extra_node_labels: Optional[ExtraNodeLabels] = ExtraNodeLabels(
+        ["Dependency", "SemgrepDependency"],
+    )
     properties: SemgrepDependencyNodeProperties = SemgrepDependencyNodeProperties()
-    sub_resource_relationship: SemgrepDependencyToSemgrepDeploymentSchema = SemgrepDependencyToSemgrepDeploymentSchema()
+    sub_resource_relationship: SemgrepDependencyToSemgrepDeploymentRel = (
+        SemgrepDependencyToSemgrepDeploymentRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
             SemgrepDependencyToGithubRepoRel(),
@@ -79,10 +87,14 @@ class SemgrepGoLibrarySchema(CartographyNodeSchema):
 
 @dataclass(frozen=True)
 class SemgrepNpmLibrarySchema(CartographyNodeSchema):
-    label: str = 'NpmLibrary'
-    extra_node_labels: Optional[ExtraNodeLabels] = ExtraNodeLabels(['Dependency', 'SemgrepDependency'])
+    label: str = "NpmLibrary"
+    extra_node_labels: Optional[ExtraNodeLabels] = ExtraNodeLabels(
+        ["Dependency", "SemgrepDependency"],
+    )
     properties: SemgrepDependencyNodeProperties = SemgrepDependencyNodeProperties()
-    sub_resource_relationship: SemgrepDependencyToSemgrepDeploymentSchema = SemgrepDependencyToSemgrepDeploymentSchema()
+    sub_resource_relationship: SemgrepDependencyToSemgrepDeploymentRel = (
+        SemgrepDependencyToSemgrepDeploymentRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
             SemgrepDependencyToGithubRepoRel(),

cartography/models/semgrep/deployment.py

@@ -7,13 +7,13 @@ from cartography.models.core.nodes import CartographyNodeSchema
 
 @dataclass(frozen=True)
 class SemgrepDeploymentProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('id')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    name: PropertyRef = PropertyRef('name', extra_index=True)
-    slug: PropertyRef = PropertyRef('slug', extra_index=True)
+    id: PropertyRef = PropertyRef("id")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    name: PropertyRef = PropertyRef("name", extra_index=True)
+    slug: PropertyRef = PropertyRef("slug", extra_index=True)
 
 
 @dataclass(frozen=True)
 class SemgrepDeploymentSchema(CartographyNodeSchema):
-    label: str = 'SemgrepDeployment'
+    label: str = "SemgrepDeployment"
     properties: SemgrepDeploymentProperties = SemgrepDeploymentProperties()

cartography/models/semgrep/findings.py

@@ -13,104 +13,120 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class SemgrepSCAFindingNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('id')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    rule_id: PropertyRef = PropertyRef('ruleId', extra_index=True)
-    repository: PropertyRef = PropertyRef('repositoryName', extra_index=True)
-    branch: PropertyRef = PropertyRef('branch')
-    summary: PropertyRef = PropertyRef('title', extra_index=True)
-    description: PropertyRef = PropertyRef('description')
-    package_manager: PropertyRef = PropertyRef('ecosystem')
-    severity: PropertyRef = PropertyRef('severity')
-    cve_id: PropertyRef = PropertyRef('cveId', extra_index=True)
-    reachability_check: PropertyRef = PropertyRef('reachability')
-    reachability_condition: PropertyRef = PropertyRef('reachableIf')
-    reachability: PropertyRef = PropertyRef('exposureType')
-    transitivity: PropertyRef = PropertyRef('transitivity')
-    dependency: PropertyRef = PropertyRef('matchedDependency')
-    dependency_fix: PropertyRef = PropertyRef('closestSafeDependency')
-    ref_urls: PropertyRef = PropertyRef('ref_urls')
-    dependency_file: PropertyRef = PropertyRef('dependencyFileLocation_path', extra_index=True)
-    dependency_file_url: PropertyRef = PropertyRef('dependencyFileLocation_url', extra_index=True)
-    scan_time: PropertyRef = PropertyRef('openedAt')
-    fix_status: PropertyRef = PropertyRef('fixStatus')
-    triage_status: PropertyRef = PropertyRef('triageStatus')
-    confidence: PropertyRef = PropertyRef('confidence')
+    id: PropertyRef = PropertyRef("id")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    rule_id: PropertyRef = PropertyRef("ruleId", extra_index=True)
+    repository: PropertyRef = PropertyRef("repositoryName", extra_index=True)
+    branch: PropertyRef = PropertyRef("branch")
+    summary: PropertyRef = PropertyRef("title", extra_index=True)
+    description: PropertyRef = PropertyRef("description")
+    package_manager: PropertyRef = PropertyRef("ecosystem")
+    severity: PropertyRef = PropertyRef("severity")
+    cve_id: PropertyRef = PropertyRef("cveId", extra_index=True)
+    reachability_check: PropertyRef = PropertyRef("reachability")
+    reachability_condition: PropertyRef = PropertyRef("reachableIf")
+    reachability: PropertyRef = PropertyRef("exposureType")
+    transitivity: PropertyRef = PropertyRef("transitivity")
+    dependency: PropertyRef = PropertyRef("matchedDependency")
+    dependency_fix: PropertyRef = PropertyRef("closestSafeDependency")
+    ref_urls: PropertyRef = PropertyRef("ref_urls")
+    dependency_file: PropertyRef = PropertyRef(
+        "dependencyFileLocation_path",
+        extra_index=True,
+    )
+    dependency_file_url: PropertyRef = PropertyRef(
+        "dependencyFileLocation_url",
+        extra_index=True,
+    )
+    scan_time: PropertyRef = PropertyRef("openedAt")
+    fix_status: PropertyRef = PropertyRef("fixStatus")
+    triage_status: PropertyRef = PropertyRef("triageStatus")
+    confidence: PropertyRef = PropertyRef("confidence")
 
 
 @dataclass(frozen=True)
 class SemgrepSCAFindingToSemgrepDeploymentRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:SemgrepSCAFinding)<-[:RESOURCE]-(:SemgrepDeployment)
-class SemgrepSCAFindingToSemgrepDeploymentSchema(CartographyRelSchema):
-    target_node_label: str = 'SemgrepDeployment'
+class SemgrepSCAFindingToSemgrepDeploymentRel(CartographyRelSchema):
+    target_node_label: str = "SemgrepDeployment"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('DEPLOYMENT_ID', set_in_kwargs=True)},
+        {"id": PropertyRef("DEPLOYMENT_ID", set_in_kwargs=True)},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "RESOURCE"
-    properties: SemgrepSCAFindingToSemgrepDeploymentRelProperties = SemgrepSCAFindingToSemgrepDeploymentRelProperties()
+    properties: SemgrepSCAFindingToSemgrepDeploymentRelProperties = (
+        SemgrepSCAFindingToSemgrepDeploymentRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class SemgrepSCAFindingToGithubRepoRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:SemgrepSCAFinding)-[:FOUND_IN]->(:GitHubRepository)
 class SemgrepSCAFindingToGithubRepoRel(CartographyRelSchema):
-    target_node_label: str = 'GitHubRepository'
+    target_node_label: str = "GitHubRepository"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'fullname': PropertyRef('repositoryName')},
+        {"fullname": PropertyRef("repositoryName")},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "FOUND_IN"
-    properties: SemgrepSCAFindingToGithubRepoRelProperties = SemgrepSCAFindingToGithubRepoRelProperties()
+    properties: SemgrepSCAFindingToGithubRepoRelProperties = (
+        SemgrepSCAFindingToGithubRepoRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class SemgrepSCAFindngToDependencyRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:SemgrepSCAFinding)-[:AFFECTS]->(:Dependency)
 class SemgrepSCAFindingToDependencyRel(CartographyRelSchema):
-    target_node_label: str = 'Dependency'
+    target_node_label: str = "Dependency"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('matchedDependency')},
+        {"id": PropertyRef("matchedDependency")},
     )
     direction: LinkDirection = LinkDirection.OUTWARD
     rel_label: str = "AFFECTS"
-    properties: SemgrepSCAFindngToDependencyRelProperties = SemgrepSCAFindngToDependencyRelProperties()
+    properties: SemgrepSCAFindngToDependencyRelProperties = (
+        SemgrepSCAFindngToDependencyRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class SemgrepSCAFindingToCVERelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:SemgrepSCAFinding)<-[:LINKED_TO]-(:CVE)
 class SemgrepSCAFindingToCVERel(CartographyRelSchema):
-    target_node_label: str = 'CVE'
+    target_node_label: str = "CVE"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('cveId')},
+        {"id": PropertyRef("cveId")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "LINKED_TO"
-    properties: SemgrepSCAFindingToCVERelProperties = SemgrepSCAFindingToCVERelProperties()
+    properties: SemgrepSCAFindingToCVERelProperties = (
+        SemgrepSCAFindingToCVERelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class SemgrepSCAFindingSchema(CartographyNodeSchema):
-    label: str = 'SemgrepSCAFinding'
+    label: str = "SemgrepSCAFinding"
     properties: SemgrepSCAFindingNodeProperties = SemgrepSCAFindingNodeProperties()
-    sub_resource_relationship: SemgrepSCAFindingToSemgrepDeploymentSchema = SemgrepSCAFindingToSemgrepDeploymentSchema()
+    sub_resource_relationship: SemgrepSCAFindingToSemgrepDeploymentRel = (
+        SemgrepSCAFindingToSemgrepDeploymentRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
             SemgrepSCAFindingToGithubRepoRel(),

cartography/models/semgrep/locations.py

@@ -13,57 +13,63 @@ from cartography.models.core.relationships import TargetNodeMatcher
 
 @dataclass(frozen=True)
 class SemgrepSCALocationProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('findingId')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
-    path: PropertyRef = PropertyRef('path', extra_index=True)
-    start_line: PropertyRef = PropertyRef('startLine')
-    start_col: PropertyRef = PropertyRef('startCol')
-    end_line: PropertyRef = PropertyRef('endLine')
-    end_col: PropertyRef = PropertyRef('endCol')
-    url: PropertyRef = PropertyRef('url')
+    id: PropertyRef = PropertyRef("findingId")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
+    path: PropertyRef = PropertyRef("path", extra_index=True)
+    start_line: PropertyRef = PropertyRef("startLine")
+    start_col: PropertyRef = PropertyRef("startCol")
+    end_line: PropertyRef = PropertyRef("endLine")
+    end_col: PropertyRef = PropertyRef("endCol")
+    url: PropertyRef = PropertyRef("url")
 
 
 @dataclass(frozen=True)
 class SemgrepSCALocToSemgrepSCAFindingRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:SemgrepSCALocation)<-[:USAGE_AT]-(:SemgrepSCAFinding)
-class SemgrepSCALocToSemgrepSCAFindingRelSchema(CartographyRelSchema):
-    target_node_label: str = 'SemgrepSCAFinding'
+class SemgrepSCALocToSemgrepSCAFindingRel(CartographyRelSchema):
+    target_node_label: str = "SemgrepSCAFinding"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('SCA_ID')},
+        {"id": PropertyRef("SCA_ID")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "USAGE_AT"
-    properties: SemgrepSCALocToSemgrepSCAFindingRelProperties = SemgrepSCALocToSemgrepSCAFindingRelProperties()
+    properties: SemgrepSCALocToSemgrepSCAFindingRelProperties = (
+        SemgrepSCALocToSemgrepSCAFindingRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class SemgrepSCALocToSemgrepSCADeploymentRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:SemgrepSCALocation)<-[:RESOURCE]-(:SemgrepSCADeployment)
-class SemgrepSCALocToSCADeploymentRelSchema(CartographyRelSchema):
-    target_node_label: str = 'SemgrepDeployment'
+class SemgrepSCALocToSCADeploymentRel(CartographyRelSchema):
+    target_node_label: str = "SemgrepDeployment"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('DEPLOYMENT_ID', set_in_kwargs=True)},
+        {"id": PropertyRef("DEPLOYMENT_ID", set_in_kwargs=True)},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "RESOURCE"
-    properties: SemgrepSCALocToSemgrepSCADeploymentRelProperties = SemgrepSCALocToSemgrepSCADeploymentRelProperties()
+    properties: SemgrepSCALocToSemgrepSCADeploymentRelProperties = (
+        SemgrepSCALocToSemgrepSCADeploymentRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class SemgrepSCALocationSchema(CartographyNodeSchema):
-    label: str = 'SemgrepSCALocation'
+    label: str = "SemgrepSCALocation"
     properties: SemgrepSCALocationProperties = SemgrepSCALocationProperties()
-    sub_resource_relationship: SemgrepSCALocToSCADeploymentRelSchema = SemgrepSCALocToSCADeploymentRelSchema()
+    sub_resource_relationship: SemgrepSCALocToSCADeploymentRel = (
+        SemgrepSCALocToSCADeploymentRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
-            SemgrepSCALocToSemgrepSCAFindingRelSchema(),
+            SemgrepSCALocToSemgrepSCAFindingRel(),
         ],
     )

cartography/models/snipeit/asset.py

@@ -16,18 +16,19 @@ class SnipeitAssetNodeProperties(CartographyNodeProperties):
     """
     https://snipe-it.readme.io/reference/hardware-list
     """
+
     # Common properties
-    id: PropertyRef = PropertyRef('id')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("id")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
     # SnipeIT specific properties
-    asset_tag: PropertyRef = PropertyRef('asset_tag')
-    assigned_to: PropertyRef = PropertyRef('assigned_to.email')
-    category: PropertyRef = PropertyRef('category.name')
-    company: PropertyRef = PropertyRef('company.name')
-    manufacturer: PropertyRef = PropertyRef('manufacturer.name')
-    model: PropertyRef = PropertyRef('model.name')
-    serial: PropertyRef = PropertyRef('serial', extra_index=True)
+    asset_tag: PropertyRef = PropertyRef("asset_tag")
+    assigned_to: PropertyRef = PropertyRef("assigned_to.email")
+    category: PropertyRef = PropertyRef("category.name")
+    company: PropertyRef = PropertyRef("company.name")
+    manufacturer: PropertyRef = PropertyRef("manufacturer.name")
+    model: PropertyRef = PropertyRef("model.name")
+    serial: PropertyRef = PropertyRef("serial", extra_index=True)
 
 
 ###
@@ -35,45 +36,53 @@ class SnipeitAssetNodeProperties(CartographyNodeProperties):
 ###
 @dataclass(frozen=True)
 class SnipeitTenantToSnipeitAssetRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 class SnipeitTenantToSnipeitAssetRel(CartographyRelSchema):
-    target_node_label: str = 'SnipeitTenant'
+    target_node_label: str = "SnipeitTenant"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('TENANT_ID', set_in_kwargs=True)},
+        {"id": PropertyRef("TENANT_ID", set_in_kwargs=True)},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "HAS_ASSET"
-    properties: SnipeitTenantToSnipeitAssetRelProperties = SnipeitTenantToSnipeitAssetRelProperties()
+    properties: SnipeitTenantToSnipeitAssetRelProperties = (
+        SnipeitTenantToSnipeitAssetRelProperties()
+    )
 
 
 ###
 # (:SnipeitUser)-[:HAS_CHECKED_OUT]->(:SnipeitAsset)
 ###
 @dataclass(frozen=True)
-class SnipeitUserToSnipeitAssetProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+class SnipeitUserToSnipeitAssetRelProperties(CartographyRelProperties):
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 class SnipeitUserToSnipeitAssetRel(CartographyRelSchema):
-    target_node_label: str = 'SnipeitUser'
+    target_node_label: str = "SnipeitUser"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'email': PropertyRef('assigned_to.email')},
+        {"email": PropertyRef("assigned_to.email")},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "HAS_CHECKED_OUT"
-    properties: SnipeitUserToSnipeitAssetProperties = SnipeitUserToSnipeitAssetProperties()
+    properties: SnipeitUserToSnipeitAssetRelProperties = (
+        SnipeitUserToSnipeitAssetRelProperties()
+    )
 
 
 ###
 @dataclass(frozen=True)
 class SnipeitAssetSchema(CartographyNodeSchema):
-    label: str = 'SnipeitAsset'  # The label of the node
-    properties: SnipeitAssetNodeProperties = SnipeitAssetNodeProperties()  # An object representing all properties
-    sub_resource_relationship: SnipeitTenantToSnipeitAssetRel = SnipeitTenantToSnipeitAssetRel()
+    label: str = "SnipeitAsset"  # The label of the node
+    properties: SnipeitAssetNodeProperties = (
+        SnipeitAssetNodeProperties()
+    )  # An object representing all properties
+    sub_resource_relationship: SnipeitTenantToSnipeitAssetRel = (
+        SnipeitTenantToSnipeitAssetRel()
+    )
     other_relationships: OtherRelationships = OtherRelationships(
         [
             SnipeitUserToSnipeitAssetRel(),

cartography/models/snipeit/tenant.py

@@ -7,11 +7,13 @@ from cartography.models.core.nodes import CartographyNodeSchema
 
 @dataclass(frozen=True)
 class SnipeitTenantNodeProperties(CartographyNodeProperties):
-    id: PropertyRef = PropertyRef('id')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("id")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 class SnipeitTenantSchema(CartographyNodeSchema):
-    label: str = 'SnipeitTenant'  # The label of the node
-    properties: SnipeitTenantNodeProperties = SnipeitTenantNodeProperties()  # An object representing all properties
+    label: str = "SnipeitTenant"  # The label of the node
+    properties: SnipeitTenantNodeProperties = (
+        SnipeitTenantNodeProperties()
+    )  # An object representing all properties

cartography/models/snipeit/user.py

@@ -15,35 +15,42 @@ class SnipeitUserNodeProperties(CartographyNodeProperties):
     """
     Ref: https://snipe-it.readme.io/reference/users
     """
+
     # Common properties
-    id: PropertyRef = PropertyRef('id')
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    id: PropertyRef = PropertyRef("id")
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
     # SnipeIT specific properties
-    company: PropertyRef = PropertyRef('company_id.name', extra_index=True)
-    email: PropertyRef = PropertyRef('email', extra_index=True)
-    username: PropertyRef = PropertyRef('username')
+    company: PropertyRef = PropertyRef("company_id.name", extra_index=True)
+    email: PropertyRef = PropertyRef("email", extra_index=True)
+    username: PropertyRef = PropertyRef("username")
 
 
 @dataclass(frozen=True)
 class SnipeitTenantToSnipeitUserRelProperties(CartographyRelProperties):
-    lastupdated: PropertyRef = PropertyRef('lastupdated', set_in_kwargs=True)
+    lastupdated: PropertyRef = PropertyRef("lastupdated", set_in_kwargs=True)
 
 
 @dataclass(frozen=True)
 # (:SnipeitTenant)-[:HAS_USER]->(:SnipeitUser)
 class SnipeitTenantToSnipeitUserRel(CartographyRelSchema):
-    target_node_label: str = 'SnipeitTenant'
+    target_node_label: str = "SnipeitTenant"
     target_node_matcher: TargetNodeMatcher = make_target_node_matcher(
-        {'id': PropertyRef('TENANT_ID', set_in_kwargs=True)},
+        {"id": PropertyRef("TENANT_ID", set_in_kwargs=True)},
     )
     direction: LinkDirection = LinkDirection.INWARD
     rel_label: str = "HAS_USER"
-    properties: SnipeitTenantToSnipeitUserRelProperties = SnipeitTenantToSnipeitUserRelProperties()
+    properties: SnipeitTenantToSnipeitUserRelProperties = (
+        SnipeitTenantToSnipeitUserRelProperties()
+    )
 
 
 @dataclass(frozen=True)
 class SnipeitUserSchema(CartographyNodeSchema):
-    label: str = 'SnipeitUser'  # The label of the node
-    properties: SnipeitUserNodeProperties = SnipeitUserNodeProperties()  # An object representing all properties
-    sub_resource_relationship: SnipeitTenantToSnipeitUserRel = SnipeitTenantToSnipeitUserRel()
+    label: str = "SnipeitUser"  # The label of the node
+    properties: SnipeitUserNodeProperties = (
+        SnipeitUserNodeProperties()
+    )  # An object representing all properties
+    sub_resource_relationship: SnipeitTenantToSnipeitUserRel = (
+        SnipeitTenantToSnipeitUserRel()
+    )