From b44101b394a68682be583d1456c77d9204342d46 Mon Sep 17 00:00:00 2001
From: Klaus Wakonig <klaus.wakonig@psi.ch>
Date: Mon, 31 May 2021 21:25:02 +0200
Subject: [PATCH] moved basesnippet and paragraph to snippet.py

---
 scilog/__init__.py |  2 +-
 scilog/scilog.py   | 33 +--------------------------------
 scilog/snippet.py  | 30 ++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/scilog/__init__.py b/scilog/__init__.py
index b3dbd1c..a15b7b8 100644
--- a/scilog/__init__.py
+++ b/scilog/__init__.py
@@ -1,5 +1,5 @@
 
 from .scicat import SciCat
 from .scilog import SciLog
-from .scilog import Basesnippet, Paragraph
+from .snippet import Basesnippet, Paragraph
 
diff --git a/scilog/scilog.py b/scilog/scilog.py
index 461d157..fa0f2db 100644
--- a/scilog/scilog.py
+++ b/scilog/scilog.py
@@ -3,42 +3,11 @@ from __future__ import annotations
 from .authclient import AuthMixin, AuthError, HEADER_JSON
 from .mkfilt import make_filter
 from .httpclient import HttpClient
-from .snippet import Snippet
+from .snippet import Snippet, Basesnippet
 from typing import TypeVar, Union, List, Type, get_type_hints
 import functools
 
 
-class Basesnippet(Snippet):
-    def __init__(self):
-        super().__init__()
-        self.set_properties(
-            id=str, 
-            parentId=str, 
-            ownerGroup=str, 
-            accessGroups=list, 
-            snippetType=str, 
-            isPrivate=bool, 
-            createdAt=str, 
-            createdBy=str, 
-            updatedAt=str, 
-            updateBy=str,
-            subsnippets=List[type(Basesnippet)],
-            tags=List[str],
-            dashboardName=str,
-            files=str,
-            location=str,
-            defaultOrder=int,
-            linkType=str,
-            versionable=bool,
-            deleted=bool)
-                            
-
-
-class Paragraph(Basesnippet):
-    def __init__(self):
-        super().__init__()
-        self.set_properties(textcontent=str, isMessage=str)
-
 
 class SciLogRestAPI(HttpClient):
     def __init__(self, url):
diff --git a/scilog/snippet.py b/scilog/snippet.py
index 1bde29b..31939ad 100644
--- a/scilog/snippet.py
+++ b/scilog/snippet.py
@@ -64,6 +64,36 @@ class Snippet(dict):
             return cls.from_dict(response)
 
 
+class Basesnippet(Snippet):
+    def __init__(self):
+        super().__init__()
+        self.set_properties(
+            id=str, 
+            parentId=str, 
+            ownerGroup=str, 
+            accessGroups=list, 
+            snippetType=str, 
+            isPrivate=bool, 
+            createdAt=str, 
+            createdBy=str, 
+            updatedAt=str, 
+            updateBy=str,
+            subsnippets=list,
+            tags=list,
+            dashboardName=str,
+            files=str,
+            location=str,
+            defaultOrder=int,
+            linkType=str,
+            versionable=bool,
+            deleted=bool)
+                            
+
+
+class Paragraph(Basesnippet):
+    def __init__(self):
+        super().__init__()
+        self.set_properties(textcontent=str, isMessage=str)
 
 
 if __name__ == "__main__":