fix: all the small issues of dotnet and python generation

Author: krvital

dev/user.clj

@@ -5,6 +5,7 @@
    [aidbox-sdk.converter :as converter]
    [aidbox-sdk.fixtures.schemas :as fixtures]
    [aidbox-sdk.generator :as gen]
+   [aidbox-sdk.generator.python :as gen.python]
    [aidbox-sdk.schema :as import]
    [aidbox-sdk.cli :as cli]
    [clojure.data]
@@ -40,48 +41,44 @@
 
   (resource-types aidbox-schemas)
   ;; => ("FHIRSchema"
+  ;;     "SearchParameter"
+  ;;     "CompartmentDefinition"
+  ;;     "ValueSet"
   ;;     "StructureDefinition")
 
   (->> aidbox-schemas
        (filter #(= "Patient" (:id %)))
        (converter/convert))
 
-  (->> aidbox-schemas
-       (filter fhir/fhir-schema?)
-       (converter/convert))
-
-  (->> aidbox-schemas
-       (filter fhir/fhir-schema?)
-       (filter fhir/constraint?)
-       (converter/convert))
-
-  (->> r4-schemas
-       (filter #(= nil (:resourceType %)))
-       (filter fhir/constraint?))
-
-  (gen/build-all!
-   :input "resources/schemas"
-   :target-language "dotnet"
-   :output "dist")
+  (converter/convert-search-params
+   (->> aidbox-schemas
+        (filter fhir/search-parameter?)
+        (remove fhir/search-parameter-from-extension?))
+   (->> aidbox-schemas
+        (filter fhir/fhir-schema?)))
 
-  (gen/build-all!
-   :auth "YmFzaWM6c2VjcmV0"
-   :target-language "dotnet"
-   :input "http://localhost:8765/api/sdk/fhir-packages"
-   :output "dist1")
+  (let [all-schemas      aidbox-schemas
 
-  (sdk/generate :dotnet "http://localhost:8765/api/sdk/fhir-packages"
-                {:auth-token "YmFzaWM6c2VjcmV0"
-                 :output-dir "dist-new"})
+        datatype?        (every-pred fhir/fhir-schema? fhir/base-schema? fhir/datatype?)
+        domain-resource? (every-pred fhir/fhir-schema? fhir/base-schema? fhir/domain-resource?)
+        constraint?      (every-pred fhir/fhir-schema? fhir/constraint? (complement fhir/extension?))
+        search-param?    (every-pred fhir/search-parameter? (complement fhir/search-parameter-from-extension?))
 
-  (cli/app {:exit (fn [s])} ["-h"])
+        fhir-schemas         (filter fhir/fhir-schema? all-schemas)
+        datatype-schemas     (filter datatype? all-schemas)
+        resource-schemas     (filter domain-resource? all-schemas)
+        constraint-schemas   (filter constraint? all-schemas)
+        search-param-schemas (filter search-param? all-schemas)
 
-  (cli/parse-args ["generate" "dotnet" "-h"])
+        ir-schemas              (converter/convert fhir-schemas)
+        datatype-ir-schemas     (converter/convert datatype-schemas)
+        resource-ir-schemas     (converter/convert resource-schemas)
+        search-param-ir-schemas (converter/convert-search-params search-param-schemas
+                                                                 fhir-schemas)]
+(gen/generate-datatypes gen.python/generator resource-ir-schemas)
+    )
 
-  (clojure.walk/postwalk (fn [x] (prn x)
 
-                           x)
 
-                         fixtures/unflattened-backbone-elements)
 
   :rcf)

src/aidbox_sdk/cli.clj

@@ -11,7 +11,7 @@
    ["-h" "--help"]])
 
 (def supported-commands #{"generate"})
-(def supported-languages #{"dotnet"})
+(def supported-languages #{"dotnet" "python"})
 
 (defn validate-args [args]
   (let [[command target-language input] args]
@@ -59,7 +59,7 @@
 
       (= command "generate")
       (try
-        (generate target-language input options)
+        (generate (keyword target-language) input options)
         (exit 0)
 
         (catch Throwable e

src/aidbox_sdk/converter.clj

@@ -192,3 +192,20 @@
        (map (fn [schema] (update schema
                                  :backbone-elements #(resolve-choices (flatten-backbones % [])))))
        (resolve-choices)))
+
+(defn resolve-elements [schemas resource]
+  (->> schemas
+       (filter #(contains? (set (:base %)) resource))
+       (map :code)
+       (distinct)
+       (sort)))
+
+(defn convert-search-params [search-params-schemas all-schemas]
+  (->> all-schemas
+       (map (fn [schema]
+              {:name (:id schema)
+               :base (when-let [base (:base schema)]
+                       (->pascal-case (url->resource-name base)))
+               :elements (->> (resolve-elements search-params-schemas (:id schema))
+                              (map (fn [el] {:type "string" :name el})))}))
+       (remove #(empty? (:elements %)))))

src/aidbox_sdk/core.clj

@@ -6,6 +6,7 @@
    [aidbox-sdk.converter :as converter]
    [aidbox-sdk.generator :as generator]
    [aidbox-sdk.generator.dotnet :as dotnet]
+   [aidbox-sdk.generator.python :as python]
    [aidbox-sdk.schema :as importer]
    [clojure.java.io :as io]))
 
@@ -16,7 +17,7 @@
 ;; I/O Helpers
 ;;
 
-(defn create-directory! [dir]
+(defn create-directory! [^java.io.File dir]
   (when-not (.mkdir dir)
     (throw (Exception. (str "Can't create directory: " dir)))))
 
@@ -42,13 +43,12 @@
 
 ;;
 ;;
-;;
 
 (defn lang->generator [lang]
   (case lang
     :dotnet dotnet/generator
-    #_#_#_#_#_#_:python python/generator
-            :typescript typescript/generator
+    :python python/generator
+    #_#_#_#_:typescript typescript/generator
         :java java/generator))
 
 (defn generate! [target-language input options]
@@ -60,17 +60,21 @@
         datatype?        (every-pred fhir/fhir-schema? fhir/base-schema? fhir/datatype?)
         domain-resource? (every-pred fhir/fhir-schema? fhir/base-schema? fhir/domain-resource?)
         constraint?      (every-pred fhir/fhir-schema? fhir/constraint? (complement fhir/extension?))
+        search-param?    (every-pred fhir/search-parameter? (complement fhir/search-parameter-from-extension?))
 
         fhir-schemas         (filter fhir/fhir-schema? all-schemas)
         datatype-schemas     (filter datatype? all-schemas)
         resource-schemas     (filter domain-resource? all-schemas)
         constraint-schemas   (filter constraint? all-schemas)
-        search-param-schemas (filter fhir/search-parameter? all-schemas)
+        search-param-schemas (filter search-param? all-schemas)
+
+        ir-schemas              (converter/convert fhir-schemas)
+        datatype-ir-schemas     (converter/convert datatype-schemas)
+        resource-ir-schemas     (converter/convert resource-schemas)
+        search-param-ir-schemas (converter/convert-search-params search-param-schemas
+                                                                 fhir-schemas)
 
-        ir-schemas           (converter/convert fhir-schemas)
-        datatype-ir-schemas  (converter/convert datatype-schemas)
-        resource-ir-schemas  (converter/convert resource-schemas)
-        generator'           (lang->generator target-language)
+        generator' (lang->generator target-language)
 
         generate-resource-module #(generator/generate-resource-module generator' %)]
 
@@ -90,7 +94,7 @@
     (save-files! (generator/generate-constraints generator' constraint-schemas ir-schemas))
 
     (println "Generating search parameters")
-    (save-files! (generator/generate-search-params generator' search-param-schemas fhir-schemas))
+    (save-files! (generator/generate-search-params generator' search-param-ir-schemas))
 
     (println "Generating common SDK files")
     (save-files! (generator/generate-sdk-files generator'))
@@ -102,3 +106,10 @@
 
 (defn -main [& args]
   (cli/app system args))
+
+(comment
+  (require 'aidbox-sdk.generator.dotnet.templates)
+
+  (map #(update % :path io/file) aidbox-sdk.generator.dotnet.templates/files)
+
+  (save-files! (io/file "/tmp/dotnet") (map #(update % :path io/file) aidbox-sdk.generator.dotnet.templates/files)))

src/aidbox_sdk/generator.clj

@@ -39,6 +39,6 @@
 (defprotocol CodeGenerator
   (generate-datatypes [this ir-schemas])
   (generate-resource-module [this ir-schema])
-  (generate-search-params [this search-schemas fhir-schemas])
+  (generate-search-params [this ir-schemas])
   (generate-constraints [this constraint-schemas ir-schemas])
   (generate-sdk-files [this]))

src/aidbox_sdk/generator/dotnet.clj

@@ -341,18 +341,19 @@
                :classes [(generate-class ir-schema
                                          (generate-backbone-classes ir-schema))])})
 
-  (generate-search-params [_ search-schemas fhir-schemas]
-    (for [{:keys [name base elements]}
-          (generator/search-parameters-structures search-schemas fhir-schemas)]
-      {:path (io/file "search" (str name "SearchParameters.cs"))
-       :content
-       (generate-module
-        :name "Aidbox.FHIR.Search"
-        :classes (generate-class
-                  {:name (str name "SearchParameters")
-                   :base  (when base
-                            (str base "SearchParameters"))
-                   :elements (map #(hash-map :value "string" :name (->pascal-case %)) elements)}))}))
+  (generate-search-params [_ ir-schemas]
+    (map (fn [ir-schema]
+           {:path (io/file "search" (str (:name ir-schema) "SearchParameters.cs"))
+            :content
+            (generate-module
+             :name "Aidbox.FHIR.Search"
+             :classes (generate-class
+                       {:name (str (:name ir-schema) "SearchParameters")
+                        :base (when (:base ir-schema)
+                                (str (:base ir-schema) "SearchParameters"))
+                        :elements (map (fn [el] (update el :name ->pascal-case))
+                                       (:elements ir-schema))}))})
+         ir-schemas))
 
   (generate-constraints [_ constraint-schemas ir-schemas]
     (->> (apply-constraints constraint-schemas (vector->map ir-schemas))

src/aidbox_sdk/generator/dotnet/templates.clj

@@ -349,7 +349,7 @@ public class Client
 (def files
   [{:path "Aidbox.csproj"
     :content aidbox-csproj}
-   {:name "Api.cs"
+   {:path "Api.cs"
     :content api-cs}
-   {:name "Client.cs"
+   {:path "Client.cs"
     :content client-cs}])

src/aidbox_sdk/generator/python.clj

@@ -76,6 +76,9 @@
   (io/file (package->directory (:package ir-schema))
            (str (->pascal-case (url->resource-name name)) ".py")))
 
+(defn search-param-filepath [ir-schema]
+  (io/file "search" (str (:name ir-schema) "SearchParameters.py")))
+
 (defn generate-polymorphic-property [element]
   nil)
 
@@ -166,14 +169,14 @@
 (defrecord PythonCodeGenerator []
   CodeGenerator
   (generate-datatypes [_ ir-schemas]
-    {:path (datatypes-file-path)
-     :content (generate-module
-               :deps [{:module "pydantic" :members ["*"]}
-                      {:module "typing" :members ["Optional" "List"]}]
-               :classes (map (fn [ir-schema]
-                               (generate-class ir-schema
-                                               (generate-backbone-classes ir-schema)))
-                             ir-schemas))})
+    [{:path (datatypes-file-path)
+      :content (generate-module
+                :deps [{:module "pydantic" :members ["*"]}
+                       {:module "typing" :members ["Optional" "List"]}]
+                :classes (map (fn [ir-schema]
+                                (generate-class ir-schema
+                                                (generate-backbone-classes ir-schema)))
+                              ir-schemas))}])
 
   (generate-resource-module [_ ir-schema]
     {:path (resource-file-path ir-schema)
@@ -184,18 +187,17 @@
                :classes [(generate-class ir-schema
                                          (generate-backbone-classes ir-schema))])})
 
-  (generate-search-params [_ search-schemas fhir-schemas]
-    (for [{:keys [name base elements]}
-          (generator/search-parameters-structures search-schemas fhir-schemas)]
-      {:path (io/file "search" (str name "SearchParameters.py"))
-       :content
-       (generate-module
-        :deps [{:module "typing" :members ["Optional"]}]
-        :classes [(generate-class
-                   {:name (str name "SearchParameters")
-                    :base (when base
-                            (str base "SearchParameters"))
-                    :elements (map #(hash-map :type "string" :name %) elements)})])}))
+  (generate-search-params [_ ir-schemas]
+    (map (fn [ir-schema]
+           {:path (search-param-filepath ir-schema)
+            :content (generate-module
+                      :deps [{:module "typing" :members ["Optional"]}]
+                      :classes [(generate-class
+                                 {:name (format "%sSearchParameters" (:name ir-schema))
+                                  :base (when (:base ir-schema)
+                                          (format "%sSearchParameters" (:base ir-schema)))
+                                  :elements (:elements ir-schema)})])})
+         ir-schemas))
 
   (generate-constraints [_ _schemas all-schemas] "")
   (generate-sdk-files [_] templates/files))

src/aidbox_sdk/models.clj

@@ -40,8 +40,16 @@
    [:backbone-elements
     [:vector BackboneElement]]])
 
+(def SearchParamIRSchema
+  [:map {:closed true}
+   [:name string?]
+   [:base string?]
+   [:elements [:vector [:map
+                        [:type "string"]
+                        [:name string?]]]]])
+
 (comment
   (m/validate IRSchema fix/patient-ir-schema)
 
-  ;
+;
   )

test/aidbox_sdk/generator/python_test.clj

@@ -103,10 +103,10 @@
         :content
         "from typing import Optional\n\nclass PatientSearchParameters(DomainResourceSearchParameters):\n    id: Optional[str] = None\n    active: Optional[str] = None\n    address: Optional[str] = None\n    address_city: Optional[str] = None\n    address_country: Optional[str] = None\n    address_postalcode: Optional[str] = None\n    address_state: Optional[str] = None\n    address_use: Optional[str] = None\n    birthdate: Optional[str] = None\n    death_date: Optional[str] = None\n    deceased: Optional[str] = None\n    email: Optional[str] = None\n    ethnicity: Optional[str] = None\n    family: Optional[str] = None\n    gender: Optional[str] = None\n    general_practitioner: Optional[str] = None\n    given: Optional[str] = None\n    identifier: Optional[str] = None\n    language: Optional[str] = None\n    link: Optional[str] = None\n    name: Optional[str] = None\n    organization: Optional[str] = None\n    part_agree: Optional[str] = None\n    phone: Optional[str] = None\n    phonetic: Optional[str] = None\n    race: Optional[str] = None\n    telecom: Optional[str] = None"}])))
 
-;; TODO
-#_(deftest generate-constraints
+#_
+(deftest generate-constraints
     (is
-     (= (sut/generate-constraints generator fixtures/some-sonstraint-ir-schema)
+     (= (sut/generate-constraints generator fixtures/some-constraint-ir-schema)
         {:path (io/file "hl7-fhir-r4-core/Patient.cs"),
          :content
          "using Aidbox.FHIR.Base;\nusing Aidbox.FHIR.Utils;\n\nnamespace Aidbox.FHIR.R4.Core;\n\npublic class Patient : DomainResource, IResource\n{\n    public bool? MultipleBirthBoolean { get; set; }\n    public Base.Address[]? Address { get; set; }\n    public string? DeceasedDateTime { get; set; }\n    public Base.ResourceReference? ManagingOrganization { get; set; }\n    public bool? DeceasedBoolean { get; set; }\n    public Base.HumanName[]? Name { get; set; }\n    public string? BirthDate { get; set; }\n    public int? MultipleBirthInteger { get; set; }\n    public object? MultipleBirth    \n    {\n        get\n        {\n            if (MultipleBirthBoolean is not null)\n            {\n                return MultipleBirthBoolean;\n            }\n    \n            if (MultipleBirthInteger is not null)\n            {\n                return MultipleBirthInteger;\n            }\n    \n            return null;\n        }\n    \n        set\n        {\n            if (value?.GetType() == typeof(bool))\n            {\n                MultipleBirthBoolean = (bool)value;return;\n            }\n    \n            if (value?.GetType() == typeof(int))\n            {\n                MultipleBirthInteger = (int)value;return;\n            }\n    \n            throw new ArgumentException(\"Invalid type provided\");\n        }\n    }\n    public object? Deceased    \n    {\n        get\n        {\n            if (DeceasedDateTime is not null)\n            {\n                return DeceasedDateTime;\n            }\n    \n            if (DeceasedBoolean is not null)\n            {\n                return DeceasedBoolean;\n            }\n    \n            return null;\n        }\n    \n        set\n        {\n            if (value?.GetType() == typeof(string))\n            {\n                DeceasedDateTime = (string)value;return;\n            }\n    \n            if (value?.GetType() == typeof(bool))\n            {\n                DeceasedBoolean = (bool)value;return;\n            }\n    \n            throw new ArgumentException(\"Invalid type provided\");\n        }\n    }\n    public Base.Attachment[]? Photo { get; set; }\n    public Patient_Link[]? Link { get; set; }\n    public bool? Active { get; set; }\n    public Patient_Communication[]? Communication { get; set; }\n    public Base.Identifier[]? Identifier { get; set; }\n    public Base.ContactPoint[]? Telecom { get; set; }\n    public Base.ResourceReference[]? GeneralPractitioner { get; set; }\n    public string? Gender { get; set; }\n    public Base.CodeableConcept? MaritalStatus { get; set; }\n    public Patient_Contact[]? Contact { get; set; }\n\n    public class Patient_Link : BackboneElement\n    {\n        public required string Type { get; set; }\n        public required Base.ResourceReference Other { get; set; }\n    }\n\n    public class Patient_Communication : BackboneElement\n    {\n        public required Base.CodeableConcept Language { get; set; }\n        public bool? Preferred { get; set; }\n    }\n\n    public class Patient_Contact : BackboneElement\n    {\n        public Base.HumanName? Name { get; set; }\n        public string? Gender { get; set; }\n        public Base.Period? Period { get; set; }\n        public Base.Address? Address { get; set; }\n        public Base.ContactPoint[]? Telecom { get; set; }\n        public Base.ResourceReference? Organization { get; set; }\n        public Base.CodeableConcept[]? Relationship { get; set; }\n    }\n}"})))