try to bring back previous API

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

cyclonedx/model/__init__.py

@@ -51,6 +51,9 @@
     SchemaVersion1Dot6,
 )
 
+# historically, contact-related classes were exposed in this module - se lets keep the API as is
+from .contact import OrganizationalContact, OrganizationalEntity
+
 
 @serializable.serializable_enum
 class DataFlow(str, Enum):

cyclonedx/model/contact.py

@@ -14,7 +14,7 @@
 # Copyright (c) OWASP Foundation. All Rights Reserved.
 
 
-from typing import Any, Iterable, Optional, Union
+from typing import TYPE_CHECKING, Any, Iterable, Optional, Union
 
 import serializable
 from sortedcontainers import SortedSet
@@ -23,9 +23,11 @@
 from ..exception.model import NoPropertiesProvidedException
 from ..schema.schema import SchemaVersion1Dot6
 from ..serialization import BomRefHelper
-from . import XsUri
 from .bom_ref import BomRef
 
+if TYPE_CHECKING:  # pragma: no cover
+    from . import XsUri
+
 
 @serializable.serializable_class
 class PostalAddress:
@@ -276,7 +278,7 @@ class OrganizationalEntity:
         See the CycloneDX Schema definition: https://cyclonedx.org/docs/1.4/xml/#type_organizationalEntity
     """
 
-    def __init__(self, *, name: Optional[str] = None, urls: Optional[Iterable[XsUri]] = None,
+    def __init__(self, *, name: Optional[str] = None, urls: Optional[Iterable['XsUri']] = None,
                  contacts: Optional[Iterable[OrganizationalContact]] = None,
                  address: Optional[PostalAddress] = None) -> None:
         if not name and not urls and not contacts:
@@ -333,7 +335,7 @@ def urls(self) -> 'SortedSet[XsUri]':
         return self._urls
 
     @urls.setter
-    def urls(self, urls: Iterable[XsUri]) -> None:
+    def urls(self, urls: Iterable['XsUri']) -> None:
         self._urls = SortedSet(urls)
 
     @property