[issue-593] expose model classes at model package level

src/spdx_tools/spdx3/bump_from_spdx2/actor.py

@@ -3,11 +3,14 @@
 # SPDX-License-Identifier: Apache-2.0
 from typing import List
 
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier, ExternalIdentifierType
-from spdx_tools.spdx3.model.organization import Organization
-from spdx_tools.spdx3.model.person import Person
-from spdx_tools.spdx3.model.tool import Tool
+from spdx_tools.spdx3.model import (
+    CreationInformation,
+    ExternalIdentifier,
+    ExternalIdentifierType,
+    Organization,
+    Person,
+    Tool,
+)
 from spdx_tools.spdx3.payload import Payload
 from spdx_tools.spdx.model.actor import Actor as Spdx2_Actor
 from spdx_tools.spdx.model.actor import ActorType

src/spdx_tools/spdx3/bump_from_spdx2/annotation.py

@@ -4,8 +4,7 @@
 from copy import deepcopy
 
 from spdx_tools.spdx3.bump_from_spdx2.actor import bump_actor
-from spdx_tools.spdx3.model.annotation import Annotation, AnnotationType
-from spdx_tools.spdx3.model.creation_information import CreationInformation
+from spdx_tools.spdx3.model import Annotation, AnnotationType, CreationInformation
 from spdx_tools.spdx3.payload import Payload
 from spdx_tools.spdx.model.actor import ActorType
 from spdx_tools.spdx.model.annotation import Annotation as Spdx2_Annotation

src/spdx_tools/spdx3/bump_from_spdx2/checksum.py

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2023 spdx contributors
 #
 # SPDX-License-Identifier: Apache-2.0
-from spdx_tools.spdx3.model.hash import Hash, HashAlgorithm
+from spdx_tools.spdx3.model import Hash, HashAlgorithm
 from spdx_tools.spdx.model.checksum import Checksum as Spdx2_Checksum
 from spdx_tools.spdx.model.checksum import ChecksumAlgorithm
 

src/spdx_tools/spdx3/bump_from_spdx2/creation_information.py

@@ -9,8 +9,7 @@
 from spdx_tools.spdx3.bump_from_spdx2.actor import bump_actor
 from spdx_tools.spdx3.bump_from_spdx2.external_document_ref import bump_external_document_ref
 from spdx_tools.spdx3.bump_from_spdx2.message import print_missing_conversion
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.spdx_document import SpdxDocument
+from spdx_tools.spdx3.model import CreationInformation, SpdxDocument
 from spdx_tools.spdx3.payload import Payload
 from spdx_tools.spdx.model.actor import ActorType
 from spdx_tools.spdx.model.document import CreationInfo as Spdx2_CreationInfo

src/spdx_tools/spdx3/bump_from_spdx2/external_document_ref.py

@@ -4,8 +4,7 @@
 from typing import List
 
 from spdx_tools.spdx3.bump_from_spdx2.checksum import bump_checksum
-from spdx_tools.spdx3.model.external_map import ExternalMap
-from spdx_tools.spdx3.model.hash import Hash
+from spdx_tools.spdx3.model import ExternalMap, Hash
 from spdx_tools.spdx.model.external_document_ref import ExternalDocumentRef
 
 

src/spdx_tools/spdx3/bump_from_spdx2/file.py

@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 from spdx_tools.spdx3.bump_from_spdx2.checksum import bump_checksum
 from spdx_tools.spdx3.bump_from_spdx2.message import print_missing_conversion
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.software.file import File
+from spdx_tools.spdx3.model import CreationInformation
+from spdx_tools.spdx3.model.software import File
 from spdx_tools.spdx3.payload import Payload
 from spdx_tools.spdx.model.file import File as Spdx2_File
 

src/spdx_tools/spdx3/bump_from_spdx2/package.py

@@ -7,11 +7,14 @@
 from spdx_tools.spdx3.bump_from_spdx2.bump_utils import handle_no_assertion_or_none
 from spdx_tools.spdx3.bump_from_spdx2.checksum import bump_checksum
 from spdx_tools.spdx3.bump_from_spdx2.message import print_missing_conversion
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier, ExternalIdentifierType
-from spdx_tools.spdx3.model.external_reference import ExternalReference, ExternalReferenceType
-from spdx_tools.spdx3.model.software.package import Package
-from spdx_tools.spdx3.model.software.software_purpose import SoftwarePurpose
+from spdx_tools.spdx3.model import (
+    CreationInformation,
+    ExternalIdentifier,
+    ExternalIdentifierType,
+    ExternalReference,
+    ExternalReferenceType,
+)
+from spdx_tools.spdx3.model.software import Package, SoftwarePurpose
 from spdx_tools.spdx3.payload import Payload
 from spdx_tools.spdx.model.package import ExternalPackageRef
 from spdx_tools.spdx.model.package import Package as Spdx2_Package

src/spdx_tools/spdx3/bump_from_spdx2/relationship.py

@@ -3,8 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 from typing import Optional, Tuple
 
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.relationship import Relationship, RelationshipCompleteness, RelationshipType
+from spdx_tools.spdx3.model import CreationInformation, Relationship, RelationshipCompleteness, RelationshipType
 from spdx_tools.spdx3.payload import Payload
 from spdx_tools.spdx.model.relationship import Relationship as Spdx2_Relationship
 from spdx_tools.spdx.model.relationship import RelationshipType as Spdx2_RelationshipType

src/spdx_tools/spdx3/bump_from_spdx2/snippet.py

@@ -2,8 +2,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 from spdx_tools.spdx3.bump_from_spdx2.message import print_missing_conversion
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.software.snippet import Snippet
+from spdx_tools.spdx3.model import CreationInformation
+from spdx_tools.spdx3.model.software import Snippet
 from spdx_tools.spdx3.payload import Payload
 from spdx_tools.spdx.model.snippet import Snippet as Spdx2_Snippet
 

src/spdx_tools/spdx3/bump_from_spdx2/spdx_document.py

@@ -7,8 +7,7 @@
 from spdx_tools.spdx3.bump_from_spdx2.package import bump_package
 from spdx_tools.spdx3.bump_from_spdx2.relationship import bump_relationship
 from spdx_tools.spdx3.bump_from_spdx2.snippet import bump_snippet
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.spdx_document import SpdxDocument
+from spdx_tools.spdx3.model import CreationInformation, SpdxDocument
 from spdx_tools.spdx3.payload import Payload
 from spdx_tools.spdx.model.document import Document as Spdx2_Document
 

src/spdx_tools/spdx3/model/__init__.py

@@ -0,0 +1,21 @@
+from spdx_tools.spdx3.model.profile_identifier import ProfileIdentifier
+from spdx_tools.spdx3.model.creation_information import CreationInformation
+from spdx_tools.spdx3.model.integrity_method import IntegrityMethod
+from spdx_tools.spdx3.model.hash import Hash, HashAlgorithm
+from spdx_tools.spdx3.model.external_reference import ExternalReference, ExternalReferenceType
+from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier, ExternalIdentifierType
+from spdx_tools.spdx3.model.external_map import ExternalMap
+from spdx_tools.spdx3.model.namespace_map import NamespaceMap
+from spdx_tools.spdx3.model.element import Element
+from spdx_tools.spdx3.model.agent import Agent
+from spdx_tools.spdx3.model.person import Person
+from spdx_tools.spdx3.model.organization import Organization
+from spdx_tools.spdx3.model.software_agent import SoftwareAgent
+from spdx_tools.spdx3.model.tool import Tool
+from spdx_tools.spdx3.model.spdx_collection import SpdxCollection
+from spdx_tools.spdx3.model.bundle import Bundle
+from spdx_tools.spdx3.model.bom import Bom
+from spdx_tools.spdx3.model.spdx_document import SpdxDocument
+from spdx_tools.spdx3.model.annotation import Annotation, AnnotationType
+from spdx_tools.spdx3.model.relationship import Relationship, RelationshipType, RelationshipCompleteness
+from spdx_tools.spdx3.model.artifact import Artifact

src/spdx_tools/spdx3/model/agent.py

@@ -5,11 +5,7 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.element import Element
-from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier
-from spdx_tools.spdx3.model.external_reference import ExternalReference
-from spdx_tools.spdx3.model.integrity_method import IntegrityMethod
+from spdx_tools.spdx3.model import CreationInformation, Element, ExternalIdentifier, ExternalReference, IntegrityMethod
 
 
 @dataclass_with_properties

src/spdx_tools/spdx3/model/annotation.py

@@ -6,11 +6,7 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.element import Element
-from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier
-from spdx_tools.spdx3.model.external_reference import ExternalReference
-from spdx_tools.spdx3.model.integrity_method import IntegrityMethod
+from spdx_tools.spdx3.model import CreationInformation, Element, ExternalIdentifier, ExternalReference, IntegrityMethod
 
 
 class AnnotationType(Enum):

src/spdx_tools/spdx3/model/artifact.py

@@ -5,7 +5,7 @@
 from typing import Optional
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
-from spdx_tools.spdx3.model.element import Element
+from spdx_tools.spdx3.model import Element
 
 
 @dataclass_with_properties

src/spdx_tools/spdx3/model/bom.py

@@ -5,13 +5,15 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx3.model.bundle import Bundle
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier
-from spdx_tools.spdx3.model.external_map import ExternalMap
-from spdx_tools.spdx3.model.external_reference import ExternalReference
-from spdx_tools.spdx3.model.integrity_method import IntegrityMethod
-from spdx_tools.spdx3.model.namespace_map import NamespaceMap
+from spdx_tools.spdx3.model import (
+    Bundle,
+    CreationInformation,
+    ExternalIdentifier,
+    ExternalMap,
+    ExternalReference,
+    IntegrityMethod,
+    NamespaceMap,
+)
 
 
 @dataclass_with_properties

src/spdx_tools/spdx3/model/bundle.py

@@ -5,13 +5,15 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier
-from spdx_tools.spdx3.model.external_map import ExternalMap
-from spdx_tools.spdx3.model.external_reference import ExternalReference
-from spdx_tools.spdx3.model.integrity_method import IntegrityMethod
-from spdx_tools.spdx3.model.namespace_map import NamespaceMap
-from spdx_tools.spdx3.model.spdx_collection import SpdxCollection
+from spdx_tools.spdx3.model import (
+    CreationInformation,
+    ExternalIdentifier,
+    ExternalMap,
+    ExternalReference,
+    IntegrityMethod,
+    NamespaceMap,
+    SpdxCollection,
+)
 
 
 @dataclass_with_properties

src/spdx_tools/spdx3/model/element.py

@@ -6,10 +6,7 @@
 from typing import List, Optional
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier
-from spdx_tools.spdx3.model.external_reference import ExternalReference
-from spdx_tools.spdx3.model.integrity_method import IntegrityMethod
+from spdx_tools.spdx3.model import CreationInformation, ExternalIdentifier, ExternalReference, IntegrityMethod
 
 
 @dataclass_with_properties

src/spdx_tools/spdx3/model/external_map.py

@@ -6,7 +6,7 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx3.model.integrity_method import IntegrityMethod
+from spdx_tools.spdx3.model import IntegrityMethod
 
 
 @dataclass_with_properties

src/spdx_tools/spdx3/model/hash.py

@@ -6,7 +6,7 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx3.model.integrity_method import IntegrityMethod
+from spdx_tools.spdx3.model import IntegrityMethod
 
 
 class HashAlgorithm(Enum):

src/spdx_tools/spdx3/model/organization.py

@@ -5,11 +5,7 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx3.model.agent import Agent
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier
-from spdx_tools.spdx3.model.external_reference import ExternalReference
-from spdx_tools.spdx3.model.integrity_method import IntegrityMethod
+from spdx_tools.spdx3.model import Agent, CreationInformation, ExternalIdentifier, ExternalReference, IntegrityMethod
 
 
 @dataclass_with_properties

src/spdx_tools/spdx3/model/person.py

@@ -5,11 +5,7 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx3.model.agent import Agent
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier
-from spdx_tools.spdx3.model.external_reference import ExternalReference
-from spdx_tools.spdx3.model.integrity_method import IntegrityMethod
+from spdx_tools.spdx3.model import Agent, CreationInformation, ExternalIdentifier, ExternalReference, IntegrityMethod
 
 
 @dataclass_with_properties

src/spdx_tools/spdx3/model/relationship.py

@@ -6,11 +6,7 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.element import Element
-from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier
-from spdx_tools.spdx3.model.external_reference import ExternalReference
-from spdx_tools.spdx3.model.integrity_method import IntegrityMethod
+from spdx_tools.spdx3.model import CreationInformation, Element, ExternalIdentifier, ExternalReference, IntegrityMethod
 
 
 class RelationshipType(Enum):

src/spdx_tools/spdx3/model/software/__init__.py

@@ -0,0 +1,5 @@
+from spdx_tools.spdx3.model.software.software_purpose import SoftwarePurpose
+from spdx_tools.spdx3.model.software.file import File
+from spdx_tools.spdx3.model.software.package import Package
+from spdx_tools.spdx3.model.software.snippet import Snippet
+from spdx_tools.spdx3.model.software.sbom import Sbom

src/spdx_tools/spdx3/model/software/file.py

@@ -5,12 +5,14 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx3.model.artifact import Artifact
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier
-from spdx_tools.spdx3.model.external_reference import ExternalReference
-from spdx_tools.spdx3.model.integrity_method import IntegrityMethod
-from spdx_tools.spdx3.model.software.software_purpose import SoftwarePurpose
+from spdx_tools.spdx3.model import (
+    Artifact,
+    CreationInformation,
+    ExternalIdentifier,
+    ExternalReference,
+    IntegrityMethod,
+)
+from spdx_tools.spdx3.model.software import SoftwarePurpose
 
 
 @dataclass_with_properties

src/spdx_tools/spdx3/model/software/package.py

@@ -5,12 +5,14 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx3.model.artifact import Artifact
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier
-from spdx_tools.spdx3.model.external_reference import ExternalReference
-from spdx_tools.spdx3.model.integrity_method import IntegrityMethod
-from spdx_tools.spdx3.model.software.software_purpose import SoftwarePurpose
+from spdx_tools.spdx3.model import (
+    Artifact,
+    CreationInformation,
+    ExternalIdentifier,
+    ExternalReference,
+    IntegrityMethod,
+)
+from spdx_tools.spdx3.model.software import SoftwarePurpose
 
 
 @dataclass_with_properties

src/spdx_tools/spdx3/model/software/sbom.py

@@ -5,13 +5,15 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx3.model.bom import Bom
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier
-from spdx_tools.spdx3.model.external_map import ExternalMap
-from spdx_tools.spdx3.model.external_reference import ExternalReference
-from spdx_tools.spdx3.model.integrity_method import IntegrityMethod
-from spdx_tools.spdx3.model.namespace_map import NamespaceMap
+from spdx_tools.spdx3.model import (
+    Bom,
+    CreationInformation,
+    ExternalIdentifier,
+    ExternalMap,
+    ExternalReference,
+    IntegrityMethod,
+    NamespaceMap,
+)
 
 
 @dataclass_with_properties

src/spdx_tools/spdx3/model/software/snippet.py

@@ -5,12 +5,14 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx3.model.artifact import Artifact
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier
-from spdx_tools.spdx3.model.external_reference import ExternalReference
-from spdx_tools.spdx3.model.integrity_method import IntegrityMethod
-from spdx_tools.spdx3.model.software.software_purpose import SoftwarePurpose
+from spdx_tools.spdx3.model import (
+    Artifact,
+    CreationInformation,
+    ExternalIdentifier,
+    ExternalReference,
+    IntegrityMethod,
+)
+from spdx_tools.spdx3.model.software import SoftwarePurpose
 
 
 @dataclass_with_properties

src/spdx_tools/spdx3/model/software_agent.py

@@ -5,11 +5,7 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx3.model.agent import Agent
-from spdx_tools.spdx3.model.creation_information import CreationInformation
-from spdx_tools.spdx3.model.external_identifier import ExternalIdentifier
-from spdx_tools.spdx3.model.external_reference import ExternalReference
-from spdx_tools.spdx3.model.integrity_method import IntegrityMethod
+from spdx_tools.spdx3.model import Agent, CreationInformation, ExternalIdentifier, ExternalReference, IntegrityMethod
 
 
 @dataclass_with_properties