Format multiline f-string

.gitignore

@@ -1,3 +1,4 @@
 /venv/
 /.idea/
-./settings_neo4jmodelcreator.json
+./settings_neo4jmodelcreator.json!/main.py
+main.py

Enums.py

@@ -6,9 +6,12 @@ class Environment(Enum):
     DEV = 'dev',
     TEI = 'tei',
     AIM = 'aim'
+    edison_acc = 'edison-acc'
+    edison = 'edison'
 
 
 class AuthType(Enum):
     JWT = 'JWT',
     CERT = 'cert',
     COOKIE = 'cookie'
+    local = 'local'

SetUp-AIM.cypher

@@ -1,17 +1,18 @@
 // Set-up database
-CREATE OR REPLACE USER neo4jPython SET PASSWORD "python" SET PASSWORD CHANGE NOT REQUIRED;
+CREATE OR REPLACE USER neo4jPython SET PASSWORD "2AN3jjki!!ukEA#t" SET PASSWORD CHANGE NOT REQUIRED;
 GRANT ROLE admin to neo4jPython;
 
-CALL apoc.periodic.iterate('MATCH (n) RETURN n', 'DETACH DELETE n', {batchSize:1000})
+CALL apoc.periodic.iterate('MATCH (n) RETURN n', 'DETACH DELETE n', {batchSize:1000});
 
 MATCH (n)-[r]->(m)
-RETURN n,r,m
+RETURN n,r,m;
 
 RETURN apoc.version() AS output;
 
 // Create indexes
-DROP constraint ON (n:Asset) ASSERT n.uuid is UNIQUE;
-DROP constraint ON (n:Agent) ASSERT n.uuid is UNIQUE;
+// DROP constraint ON (n:Asset) ASSERT n.uuid is UNIQUE;
+// DROP constraint ON (n:Agent) ASSERT n.uuid is UNIQUE;
+CALL apoc.schema.assert({}, {});
 CREATE CONSTRAINT asset_uuid IF NOT EXISTS FOR (n:Asset) REQUIRE n.uuid IS UNIQUE;
 CREATE CONSTRAINT agent_uuid IF NOT EXISTS FOR (n:Agent) REQUIRE n.uuid IS UNIQUE;
 CREATE INDEX actief  FOR (n:Asset) ON (n.isActief);

environment-Neo4jOSLOFromAwvInfra.yml

@@ -0,0 +1,77 @@
+name: Neo4jOSLOFromAwvInfra
+channels:
+  - conda-forge
+  - defaults
+dependencies:
+  - bzip2=1.0.8=he774522_0
+  - ca-certificates=2022.12.7=h5b45459_0
+  - libffi=3.4.2=hd77b12b_4
+  - openssl=1.1.1s=h2bbff1b_0
+  - pip=22.1.2=py310haa95532_0
+  - python=3.10.4=hbb2ffb3_0
+  - python-decouple=3.6=pyhd8ed1ab_0
+  - setuptools=63.4.1=py310haa95532_0
+  - sqlite=3.39.2=h2bbff1b_0
+  - tk=8.6.12=h2bbff1b_0
+  - vc=14.2=h21ff451_1
+  - vs2015_runtime=14.27.29016=h5e58377_2
+  - wheel=0.37.1=pyhd3eb1b0_0
+  - wincertstore=0.2=py310haa95532_2
+  - xz=5.2.6=h8cc25b3_0
+  - zlib=1.2.12=h8cc25b3_3
+  - pip:
+    - asttokens==2.0.5
+    - backcall==0.2.0
+    - beautifulsoup4==4.10.0
+    - certifi==2021.10.8
+    - cffi==1.15.0
+    - charset-normalizer==2.0.11
+    - colorama==0.4.4
+    - contourpy==1.0.5
+    - cryptography==36.0.2
+    - cycler==0.11.0
+    - decorator==5.1.1
+    - docopt==0.6.2
+    - executing==0.8.3
+    - fonttools==4.37.4
+    - idna==3.3
+    - isodate==0.6.1
+    - jinja2==3.1.1
+    - js2py==0.71
+    - jsonpickle==2.1.0
+    - kiwisolver==1.4.4
+    - markupsafe==2.1.1
+    - matplotlib==3.6.1
+    - matplotlib-inline==0.1.3
+    - neo4j==4.4.1
+    - networkx==2.8
+    - numpy==1.23.3
+    - packaging==21.3
+    - parso==0.8.3
+    - pickleshare==0.7.5
+    - pillow==9.2.0
+    - pipwin==0.5.1
+    - prompt-toolkit==3.0.29
+    - pure-eval==0.2.2
+    - pycparser==2.21
+    - pygments==2.11.2
+    - pyjsparser==2.7.1
+    - pyjwt==2.3.0
+    - pyparsing==3.0.7
+    - pyprind==2.11.3
+    - pysmartdl==1.3.4
+    - python-dateutil==2.8.2
+    - pytz==2021.3
+    - pytz-deprecation-shim==0.1.0.post0
+    - rdflib==6.1.1
+    - requests==2.27.1
+    - six==1.16.0
+    - soupsieve==2.3.1
+    - stack-data==0.2.0
+    - timer==0.2.2
+    - traitlets==5.1.1
+    - tzdata==2021.5
+    - tzlocal==4.1
+    - urllib3==1.26.8
+    - wcwidth==0.2.5
+prefix: C:\Users\devosar\Anaconda3\envs\Neo4jOSLOFromAwvInfra

main.py

@@ -1,32 +1,31 @@
-import json
 import logging
-from pathlib import Path
 
-from AbstractRequester import AbstractRequester
 from EMInfraImporter import EMInfraImporter
-from Enums import AuthType, Environment
 from Neo4JConnector import Neo4JConnector
 from RequestHandler import RequestHandler
 from RequesterFactory import RequesterFactory
 from SettingsManager import SettingsManager
+from Enums import AuthType, Environment
 from Syncer import Syncer
-
+from decouple import Config, RepositoryEnv
 
 if __name__ == '__main__':
-    logging.basicConfig(
-        format='%(asctime)s %(levelname)-8s %(message)s',
-        level=logging.INFO,
-        datefmt='%Y-%m-%d %H:%M:%S')
-
-    connector = Neo4JConnector(uri="bolt://localhost:7687", user="neo4j", password="neo4jadmin", database='neo4j')
-    settings_path = Path('/home/davidlinux/Documents/AWV/resources/settings_neo4jmodelcreator.json')
-    # settings_path = Path('C:\\resources\\settings_neo4jmodelcreator.json')
-
-    with open(settings_path) as settings_file:
-        settings = json.load(settings_file)
+    #Test
+    # Settings
+    logging.basicConfig(level=logging.INFO)
+    config = Config(RepositoryEnv(r"C:\Users\devosar\PycharmProjects\Intelligent Incident Detection (IID)\utils\.env"))
 
-    requester = RequesterFactory.create_requester(settings=settings, auth_type=AuthType.JWT, env=Environment.PRD)
+    # Set up connection to Neo4j instance (DBMS)
+    username = config('username_neo4j', default='')  # not just username because this is predefined variable, see .env
+    password = config('password_neo4j', default='')
+    connector = Neo4JConnector(uri="bolt://localhost:7687", user=username, password=password)
 
+    # Syncing settings
+    settings_manager = SettingsManager(settings_path='.\\settings_neo4jmodelcreator.json')
+    requester = RequesterFactory.create_requester(settings=settings_manager.settings, auth_type=AuthType.JWT, env=Environment.PRD)
+    # request_handler = RequestHandler(requester)
+    #
+    # eminfra_importer = EMInfraImporter(request_handler)
     eminfra_importer = EMInfraImporter(requester)
-    syncer = Syncer(connector=connector, requester=requester, eminfra_importer=eminfra_importer, settings=settings)
+    syncer = Syncer(connector=connector, requester=requester, eminfra_importer=eminfra_importer, settings=settings_manager.settings)
     syncer.start_syncing()