cognite-neat 0.85.0__py3-none-any.whl → 0.85.2__py3-none-any.whl

cognite/neat/_version.py

@@ -1 +1 @@
-__version__ = "0.85.0"
+__version__ = "0.85.2"

cognite/neat/graph/extractors/_classic_cdf/_files.py

@@ -16,13 +16,20 @@ from cognite.neat.utils.utils import string_to_ideal_type
 
 
 class FilesExtractor(BaseExtractor):
+    """Extract data from Cognite Data Fusions files metadata into Neat.
+
+    Args:
+        files_metadata (Iterable[FileMetadata]): An iterable of files metadata.
+        namespace (Namespace, optional): The namespace to use. Defaults to DEFAULT_NAMESPACE.
+    """
+
     def __init__(
         self,
-        events: Iterable[FileMetadata],
+        files_metadata: Iterable[FileMetadata],
         namespace: Namespace | None = None,
     ):
         self.namespace = namespace or DEFAULT_NAMESPACE
-        self.events = events
+        self.files_metadata = files_metadata
 
     @classmethod
     def from_dataset(
@@ -39,7 +46,7 @@ class FilesExtractor(BaseExtractor):
 
     def extract(self) -> Iterable[Triple]:
         """Extract files metadata as triples."""
-        for event in self.events:
+        for event in self.files_metadata:
             yield from self._file2triples(event, self.namespace)
 
     @classmethod

cognite/neat/graph/queries/_base.py

@@ -97,3 +97,27 @@ class Queries:
         else:
             warnings.warn("No rules found for the graph store, returning empty list.", stacklevel=2)
             return []
+
+    def list_triples(self, limit: int = 25) -> list[ResultRow]:
+        """List triples in the graph store
+
+        Args:
+            limit: Max number of triples to return, by default 25
+
+        Returns:
+            List of triples
+        """
+        query = f"SELECT ?subject ?predicate ?object WHERE {{ ?subject ?predicate ?object }} LIMIT {limit}"
+        return cast(list[ResultRow], list(self.graph.query(query)))
+
+    def list_types(self, limit: int = 25) -> list[ResultRow]:
+        """List types in the graph store
+
+        Args:
+            limit: Max number of types to return, by default 25
+
+        Returns:
+            List of types
+        """
+        query = f"SELECT DISTINCT ?type WHERE {{ ?subject a ?type }} LIMIT {limit}"
+        return cast(list[ResultRow], list(self.graph.query(query)))

cognite/neat/rules/importers/_inference2rules.py

@@ -7,7 +7,7 @@ from rdflib import Graph, Namespace, URIRef
 from rdflib import Literal as RdfLiteral
 
 import cognite.neat.rules.issues as issues
-from cognite.neat.constants import PREFIXES
+from cognite.neat.constants import DEFAULT_NAMESPACE, PREFIXES
 from cognite.neat.graph.stores import NeatGraphStore
 from cognite.neat.rules.importers._base import BaseImporter, Rules, _handle_issues
 from cognite.neat.rules.issues import IssueList
@@ -246,8 +246,8 @@ class InferenceImporter(BaseImporter):
             created=datetime.now(),
             updated=datetime.now(),
             description="Inferred model from knowledge graph",
-            prefix="inferred",
-            namespace="http://purl.org/cognite/neat/inferred/",
+            prefix="neat",
+            namespace=DEFAULT_NAMESPACE,
         )
 
     @classmethod

cognite/neat/utils/auth.py

@@ -18,7 +18,9 @@ _VALID_LOGIN_FLOWS = get_args(_LOGIN_FLOW)
 _CLIENT_NAME = f"CogniteNeat:{_version.__version__}"
 
 
-def get_cognite_client() -> CogniteClient:
+def get_cognite_client(env_file_name: str = ".env") -> CogniteClient:
+    if not env_file_name.endswith(".env"):
+        raise ValueError("env_file_name must end with '.env'")
     with suppress(KeyError):
         variables = _EnvironmentVariables.create_from_environ()
         return variables.get_client()
@@ -26,16 +28,16 @@ def get_cognite_client() -> CogniteClient:
     repo_root = _repo_root()
     if repo_root:
         with suppress(KeyError, FileNotFoundError, TypeError):
-            variables = _from_dotenv(repo_root / ".env")
+            variables = _from_dotenv(repo_root / env_file_name)
             client = variables.get_client()
             print("Found .env file in repository root. Loaded variables from .env file.")
             return client
     variables = _prompt_user()
-    if repo_root and _env_in_gitignore(repo_root):
+    if repo_root and _env_in_gitignore(repo_root, env_file_name):
         local_import("rich", "jupyter")
         from rich.prompt import Prompt
 
-        env_file = repo_root / ".env"
+        env_file = repo_root / env_file_name
         answer = Prompt.ask(
             "Do you store the variables in an .env file in the repository root for easy reuse?", choices=["y", "n"]
         )
@@ -88,7 +90,7 @@ class _EnvironmentVariables:
     @property
     def idp_scopes(self) -> list[str]:
         if self.IDP_SCOPES:
-            return self.IDP_SCOPES.split()
+            return self.IDP_SCOPES.split(",")
         return [f"https://{self.CDF_CLUSTER}.cognitedata.com/.default"]
 
     @property
@@ -187,7 +189,7 @@ class _EnvironmentVariables:
             value = getattr(self, name)
             if value is not None:
                 if isinstance(value, list):
-                    value = " ".join(value)
+                    value = ",".join(value)
                 lines.append(f"{field.name}={value}")
         return "\n".join(lines)
 
@@ -199,7 +201,7 @@ def _from_dotenv(evn_file: Path) -> _EnvironmentVariables:
     valid_variables = {f.name for f in fields(_EnvironmentVariables)}
     variables: dict[str, str] = {}
     for line in content.splitlines():
-        if line.startswith("#") or not line:
+        if line.startswith("#") or "=" not in line:
             continue
         key, value = line.split("=", 1)
         if key in valid_variables:
@@ -241,8 +243,13 @@ def _prompt_user() -> _EnvironmentVariables:
             token_url = Prompt.ask("Enter IDP_TOKEN_URL")
             variables.IDP_TOKEN_URL = token_url
         optional = ["IDP_AUDIENCE", "IDP_SCOPES"]
-    else:
-        optional = ["IDP_TENANT_ID", "IDP_SCOPES"]
+    else:  # login_flow == "interactive"
+        tenant_id = Prompt.ask("Enter IDP_TENANT_ID (leave empty to enter IDP_AUTHORITY_URL instead)")
+        if tenant_id:
+            variables.IDP_TENANT_ID = tenant_id
+        else:
+            variables.IDP_AUTHORITY_URL = Prompt.ask("Enter IDP_TOKEN_URL")
+        optional = ["IDP_SCOPES"]
 
     defaults = "".join(f"\n - {name}: {getattr(variables, name.lower())}" for name in optional)
     use_defaults = Prompt.ask(
@@ -284,15 +291,15 @@ def _repo_root() -> Path | None:
     return None
 
 
-def _env_in_gitignore(repo_root: Path) -> bool:
+def _env_in_gitignore(repo_root: Path, env_file_name: str) -> bool:
     ignore_file = repo_root / ".gitignore"
     if not ignore_file.exists():
         return False
     else:
         ignored = {line.strip() for line in ignore_file.read_text().splitlines()}
-        return ".env" in ignored or "*.env" in ignored
+        return env_file_name in ignored or "*.env" in ignored
 
 
 if __name__ == "__main__":
-    c = _prompt_user().get_client()
+    c = get_cognite_client()
     print(c.iam.token.inspect())

{cognite_neat-0.85.0.dist-info → cognite_neat-0.85.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cognite-neat
-Version: 0.85.0
+Version: 0.85.2
 Summary: Knowledge graph transformation
 Home-page: https://cognite-neat.readthedocs-hosted.com/
 License: Apache-2.0

{cognite_neat-0.85.0.dist-info → cognite_neat-0.85.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cognite/neat/__init__.py,sha256=AiexNcHdAHFbrrbo9c65gtil1dqx_SGraDH1PSsXjKE,126
 cognite/neat/_shared.py,sha256=RSaHm2eJceTlvb-hMMe4nHgoHdPYDfN3XcxDXo24k3A,1530
-cognite/neat/_version.py,sha256=oS_t2ihHSRa_TQs1XBgfsFFpaFOEDZAndDmjccnIF4g,23
+cognite/neat/_version.py,sha256=KJl3iR2SY5vGxzthLO9dh1TLLxtswsW9LCjfengv-Fw,23
 cognite/neat/app/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/app/api/asgi/metrics.py,sha256=nxFy7L5cChTI0a-zkCiJ59Aq8yLuIJp5c9Dg0wRXtV0,152
 cognite/neat/app/api/configuration.py,sha256=2U5M6M252swvQPQyooA1EBzFUZNtcTmuSaywfJDgckM,4232
@@ -59,7 +59,7 @@ cognite/neat/graph/extractors/_base.py,sha256=8IWygpkQTwo0UOmbbwWVI7540_klTVdUVX
 cognite/neat/graph/extractors/_classic_cdf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/neat/graph/extractors/_classic_cdf/_assets.py,sha256=Hu-RoTBhn4LFm38G51L5tc0MVy4-zr1POHWyrIB-vUc,4130
 cognite/neat/graph/extractors/_classic_cdf/_events.py,sha256=SGZWKCxppECIQkwQs5M2e_SoF-eGilCW2KiyXk2PmzM,4230
-cognite/neat/graph/extractors/_classic_cdf/_files.py,sha256=-6nCkXUCAnDsv4eDFDEiQ-U4SGhmW1VLxZJFUcszqjU,4831
+cognite/neat/graph/extractors/_classic_cdf/_files.py,sha256=o35K0_ouq7hjR_lAVRjWbuRsuAzlS78S_97am5TFU5A,5129
 cognite/neat/graph/extractors/_classic_cdf/_labels.py,sha256=4JxQHPDciMjbk7F6GxMa-HfhOgAv8LT3VO3mRfEgQ0E,2832
 cognite/neat/graph/extractors/_classic_cdf/_relationships.py,sha256=jgIN__nztlhLwoIJw59s2-Blc9gxIm7YDha5qEoXBSg,5654
 cognite/neat/graph/extractors/_classic_cdf/_sequences.py,sha256=5FuhwpgDiGG51C0bQacQ4LD6KkutUaU1cX2NSy_krhU,3652
@@ -75,7 +75,7 @@ cognite/neat/graph/loaders/_rdf2asset.py,sha256=aFby7BwIrW253LEJ4XqGeUuf4jG9VUe8
 cognite/neat/graph/loaders/_rdf2dms.py,sha256=xyr0SfIusfjYjlAXZcIGS1-IQ6LoVWeOB3_q6D304oo,13603
 cognite/neat/graph/models.py,sha256=AtLgZh2qyRP6NRetjQCy9qLMuTQB0CH52Zsev-qa2sk,149
 cognite/neat/graph/queries/__init__.py,sha256=BgDd-037kvtWwAoGAy8eORVNMiZ5-E9sIV0txIpeaN4,50
-cognite/neat/graph/queries/_base.py,sha256=20A7GDBdmc35VmHVz5n0YCGPcnBAmUX-bM2ImHPManc,3844
+cognite/neat/graph/queries/_base.py,sha256=pSc6nHpcDEStGtIeeboAI-QD2PbckWaaNMK3As04jOI,4658
 cognite/neat/graph/queries/_construct.py,sha256=FxzSQqzCpo7lKVYerlLAY03oqCeFM5L6MozfBUblzr4,7341
 cognite/neat/graph/queries/_shared.py,sha256=EwW2RbPttt7-z7QTgfKWlthA2Nq5d3bYyyewFkCA7R4,5043
 cognite/neat/graph/stores/__init__.py,sha256=G-VG_YwfRt1kuPao07PDJyZ3w_0-eguzLUM13n-Z_RA,64
@@ -203,7 +203,7 @@ cognite/neat/rules/importers/_dtdl2rules/_unit_lookup.py,sha256=wW4saKva61Q_i17g
 cognite/neat/rules/importers/_dtdl2rules/dtdl_converter.py,sha256=ysmWUxZ0npwrTB0uiH5jA0v37sfCwowGaYk17IyxPUU,12663
 cognite/neat/rules/importers/_dtdl2rules/dtdl_importer.py,sha256=Psj3C2jembY_Wu7WWJIFIwrMawvjISjeqfBnoRy_csw,6740
 cognite/neat/rules/importers/_dtdl2rules/spec.py,sha256=tim_MfN1J0F3Oeqk3BMgIA82d_MZvhRuRMsLK3B4PYc,11897
-cognite/neat/rules/importers/_inference2rules.py,sha256=OilV3aF3LTjFHK2Yzs8KktTGG41iPB4hh3u1aAwhNbI,11675
+cognite/neat/rules/importers/_inference2rules.py,sha256=bBpzrioIZl3xdzz5Pal_GJyVPx08ascYW7uckixUy0Q,11667
 cognite/neat/rules/importers/_owl2rules/__init__.py,sha256=tdGcrgtozdQyST-pTlxIa4cLBNTLvtk1nNYR4vOdFSw,63
 cognite/neat/rules/importers/_owl2rules/_owl2classes.py,sha256=QpTxvrTGczIa48X8lgXGnMN1AWPhHK0DR6uNq175xak,7357
 cognite/neat/rules/importers/_owl2rules/_owl2metadata.py,sha256=nwnUaBNAAYMoBre2UmsnkJXUuaqGEpR3U3txDrH2w6g,7527
@@ -251,7 +251,7 @@ cognite/neat/rules/models/information/_serializer.py,sha256=yti9I_xJruxrib66YIBI
 cognite/neat/rules/models/information/_validation.py,sha256=Is2GzL2lZU3A5zPu3NjvlXfmIU2_Y10C5Nxi5Denz4g,7528
 cognite/neat/rules/models/wrapped_entities.py,sha256=ThhjnNNrpgz0HeORIQ8Q894trxP73P7T_TuZj6qH2CU,7157
 cognite/neat/utils/__init__.py,sha256=l5Nyqhqo25bcQXCOb_lk01cr-UXsG8cczz_y_I0u6bg,68
-cognite/neat/utils/auth.py,sha256=0UeZH4nx-0LizNsBrYJiquK6ZldNYk_2frLBZzcB5JM,11270
+cognite/neat/utils/auth.py,sha256=rBzx92IN4xGj3UK95UExKlK2dCwQi3svTZ_YBMWaTVo,11739
 cognite/neat/utils/auxiliary.py,sha256=IOVbr6lPQulMJUyrrhfSsF6lIHch0Aw6KszMkBomprc,1248
 cognite/neat/utils/cdf.py,sha256=piRx-6GRz4cCfBZD5rU0OM6ixQ3cj5TMzI0yCYUveR8,2422
 cognite/neat/utils/cdf_classes.py,sha256=NEmz5UprBlqfqZnqJkRk5xjSpzazwHbhcWsMH_GNxP8,5831
@@ -310,8 +310,8 @@ cognite/neat/workflows/steps_registry.py,sha256=fkTX14ZA7_gkUYfWIlx7A1XbCidvqR23
 cognite/neat/workflows/tasks.py,sha256=dqlJwKAb0jlkl7abbY8RRz3m7MT4SK8-7cntMWkOYjw,788
 cognite/neat/workflows/triggers.py,sha256=_BLNplzoz0iic367u1mhHMHiUrCwP-SLK6_CZzfODX0,7071
 cognite/neat/workflows/utils.py,sha256=gKdy3RLG7ctRhbCRwaDIWpL9Mi98zm56-d4jfHDqP1E,453
-cognite_neat-0.85.0.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
-cognite_neat-0.85.0.dist-info/METADATA,sha256=v0E853i0iw38J4bJSXaqj-K7ZLL9aBaTO4roAkCu-VE,9493
-cognite_neat-0.85.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-cognite_neat-0.85.0.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
-cognite_neat-0.85.0.dist-info/RECORD,,
+cognite_neat-0.85.2.dist-info/LICENSE,sha256=W8VmvFia4WHa3Gqxq1Ygrq85McUNqIGDVgtdvzT-XqA,11351
+cognite_neat-0.85.2.dist-info/METADATA,sha256=ZX3Pa8xd3fAqOiem-NJ2rzWjeP8FlMaihmnGVHYok9I,9493
+cognite_neat-0.85.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+cognite_neat-0.85.2.dist-info/entry_points.txt,sha256=61FPqiWb25vbqB0KI7znG8nsg_ibLHBvTjYnkPvNFso,50
+cognite_neat-0.85.2.dist-info/RECORD,,