Merge pull request #194 from statisticsnorway/reduce-print-statments

Reduserer antall print

Author: Bjoern-Rapp

demo/classification.py

@@ -13,38 +13,40 @@
 # ---
 
 # %%
+from IPython.display import display
+
 from klass import KlassClassification
 
 # %%
 # ID found from website: https://www.ssb.no/klass/
 nus = KlassClassification(36, language="en", include_future=True)
-print(nus)
+display(nus)
 
 # %%
-repr(nus)
+display(repr(nus))
 
 # %%
 # Reformatting for fun
-nus.versions_dict()
+display(nus.versions_dict())
 
 # %%
 nuskoder = nus.get_codes("2023-01-01")
-print(nuskoder)
+display(nuskoder)
 
 # %%
-nuskoder.pivot_level()
+display(nuskoder.pivot_level())
 
 # %%
-nuskoder.data
+display(nuskoder.data)
 
 # %%
 # The actual data is under the .data attribute
-nuskoder.data
+display(nuskoder.data)
 
 # %%
 # Pivots levels into seperate columns
-nuskoder.pivot_level()
+display(nuskoder.pivot_level())
 
 # %%
 # You can filter to a level when getting codes, and then make dict from that level
-nus.get_codes("2023-01-01", select_level=5).to_dict()
+display(nus.get_codes("2023-01-01", select_level=5).to_dict())

demo/config.py

@@ -13,18 +13,15 @@
 # ---
 
 # %%
+from IPython.display import display
+
 import klass
+import klass.config
 
 # %%
 [x for x in dir(klass.config) if not x.startswith("_")]
 
 # %%
-klass.config.TESTING
-
-# %%
-klass.config.TESTING = True
-
-# %%
-klass.classification_by_id(36)
+display(klass.classification_by_id(36))
 
 # %%

demo/correspondence.py

@@ -13,6 +13,8 @@
 # ---
 
 # %%
+from IPython.display import display
+
 from klass import KlassCorrespondence
 
 # %%
@@ -28,10 +30,10 @@
 )
 
 # %%
-print(fylke_komm)
+display(fylke_komm)
 
 # %%
-fylke_komm.data
+display(fylke_komm.data)
 
 # %%
-fylke_komm.to_dict("sourceName", "targetName")
+display(fylke_komm.to_dict("sourceName", "targetName"))

demo/family.py

@@ -13,25 +13,27 @@
 # ---
 
 # %%
+from IPython.display import display
+
 from klass import KlassSearchFamilies
 
 # %%
 search = KlassSearchFamilies("360")
-print(search)
+display(search)
 
 # %%
 utdanning = search.get_family(20)
-print(utdanning)
+display(utdanning)
 
 # %%
 nus = utdanning.get_classification(36)
-print(nus)
+display(nus)
 
 # %%
 nus_codes = nus.get_codes("2023-01-01")
-print(nus_codes)
+display(nus_codes)
 
 # %%
-nus_codes.data
+display(nus_codes.data)
 
 # %%

demo/gui_ipywidgets.py

@@ -12,21 +12,21 @@
 #     name: ssb-klass-python
 # ---
 
-# %%
-import klass
-
-klass.search_classification()
-
 # %%
 from datetime import date
 
-import IPython.display.display
 import ipywidgets as widgets
 from IPython.display import HTML
+from IPython.display import display
 
+import klass
 from klass.classes.search import KlassSearchClassifications
 from klass.requests.sections import sections_dict
 
+# %%
+display(klass.search_classification())
+
+# %%
 DEFAULT_CHOICE = "Choose..."
 
 
@@ -61,7 +61,7 @@ def do_search(btn: widgets.Button) -> None:
 
         with search_result:
             search_result.clear_output()
-            IPython.display.display("Searching...")  # type: ignore
+            display("Searching...")  # type: ignore
             # Add loading-gif?
 
         try:
@@ -82,7 +82,7 @@ def do_search(btn: widgets.Button) -> None:
 
         with search_result:
             search_result.clear_output()
-            IPython.display.display(HTML(search_content))  # type: ignore
+            display(HTML(search_content))  # type: ignore
 
     sections = [DEFAULT_CHOICE, *list(sections_dict().keys())]
     section_dropdown = widgets.Dropdown(
@@ -137,9 +137,10 @@ def format_classification_text(search_class: KlassSearchClassifications) -> str:
     return search_content
 
 
-search_classification()
+# %%
+display(search_classification())
 
 # %%
-KlassSearchClassifications("Utdanning", include_codelists=True, no_dupes=True)
+display(KlassSearchClassifications("Utdanning", include_codelists=True, no_dupes=True))
 
 # %%

demo/join_kommune_fylke.py

@@ -14,6 +14,7 @@
 
 # %%
 import pandas as pd
+from IPython.display import display
 
 from klass import KlassClassification
 
@@ -34,6 +35,6 @@
 # %%
 kom["fylkesnummer"] = kom["kommunenummer"].str[:2]
 komfyl = pd.merge(kom, fyl, how="left", on="fylkesnummer")
-komfyl
+display(komfyl)
 
 # %%

demo/quarter_seb.py

@@ -13,6 +13,8 @@
 # ---
 
 # %%
+from IPython.display import display
+
 from klass import KlassCorrespondence
 
 # %%
@@ -24,19 +26,19 @@
 )
 
 # %%
-bydel.from_date
+display(bydel.from_date)
 
 # %%
 # Reset by parameter "contain_quarter" during initialization
-bydel.to_date
+display(bydel.to_date)
 
 # %%
-bydel.data
+display(bydel.data)
 
 # %%
-bydel.data["validFrom"].min()
+display(bydel.data["validFrom"].min())
 
 # %%
-bydel.data["validTo"].max()
+display(bydel.data["validTo"].max())
 
 # %%

demo/requestfunctions.py

@@ -13,71 +13,81 @@
 # ---
 
 # %%
+from IPython.display import display
+
 import klass
 
 # %%
 klassifikasjoner = klass.classifications(
     include_codelists=True, changed_since="2022-01-01"
 )
 
-# %%
+# %% [markdown]
 # klassifikasjoner
 
 # %%
-klass.classification_by_id("36").keys()
+display(klass.classification_by_id("36").keys())
 
 # %%
-klass.codes(classification_id="36", from_date="2020-01-01", to_date="2023-01-02")
+display(
+    klass.codes(classification_id="36", from_date="2020-01-01", to_date="2023-01-02")
+)
 
 # %% [raw]
 #
 
 # %%
-klass.version_by_id("1954")["classificationVariants"]
+display(klass.version_by_id("1954")["classificationVariants"])
 
 # %%
 # SELECT_LEVEL DOESNT WORK IN API?
-klass.variant(
-    "36",
-    "Studiepoeng ved fagskole",
-    "2023-01-01",
-    # select_level=2,
-    # return_type="json"
+display(
+    klass.variant(
+        "36",
+        "Studiepoeng ved fagskole",
+        "2023-01-01",
+        # select_level=2,
+        # return_type="json"
+    )
 )
 
 # %%
-klass.variant_at("36", "Studiepoeng ved fagskole", date="2022-01-01")
+display(klass.variant_at("36", "Studiepoeng ved fagskole", date="2022-01-01"))
 
 # %%
-klass.codes_at(classification_id="36", date="2023-01-01", language="en")
+display(klass.codes_at(classification_id="36", date="2023-01-01", language="en"))
 
 # %%
-klass.corresponds(
-    source_classification_id=104,
-    target_classification_id=131,
-    from_date="2023-01-01",
-    to_date="2024-01-01",
-    language="en",
-    include_future=True,
+display(
+    klass.corresponds(
+        source_classification_id=104,
+        target_classification_id=131,
+        from_date="2023-01-01",
+        to_date="2024-01-01",
+        language="en",
+        include_future=True,
+    )
 )
 
 # %%
-klass.corresponds_at(
-    source_classification_id=104,
-    target_classification_id=131,
-    date="2023-01-01",
+display(
+    klass.corresponds_at(
+        source_classification_id=104,
+        target_classification_id=131,
+        date="2023-01-01",
+    )
 )
 
 # %%
-klass.correspondence_table_by_id("1111", language="en")["name"]
+display(klass.correspondence_table_by_id("1111", language="en")["name"])
 
 # %%
-klass.changes("36", "2020-01-01", "2023-01-01")
+display(klass.changes("36", "2020-01-01", "2023-01-01"))
 
 # %%
-klass.classificationfamilies("360")
+display(klass.classificationfamilies("360"))
 
 # %%
-klass.classificationfamilies_by_id(20)
+display(klass.classificationfamilies_by_id(20))
 
 # %%

demo/search.py

@@ -13,33 +13,35 @@
 # ---
 
 # %%
+from IPython.display import display
+
 from klass import KlassSearchClassifications
 from klass import KlassSearchFamilies
 
 # %%
 search = KlassSearchClassifications("land", no_dupes=True)
-print(search)
+display(search)
 
 # %%
-print(search.get_classification(106))
+display(search.get_classification(106))
 
 # %%
 ours = KlassSearchFamilies(360)
-print(ours)
+display(ours)
 
 # %%
-ours.families
+display(ours.families)
 
 # %%
 utdanning = ours.get_family(20)
 
 # %%
-print(utdanning)
+display(utdanning)
 
 # %%
 isced = utdanning.get_classification(66)
 
 # %%
-print(isced)
+display(isced)
 
 # %%