From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Bruno Victal <mirai@makinata.eu>
Cc: 63985@debbugs.gnu.org
Subject: [bug#63985] [PATCH RFC 0/5] Generic INI serializer & SRFI-171 for define-configuration
Date: Mon, 02 Oct 2023 13:25:56 -0400 [thread overview]
Message-ID: <871qed3pi3.fsf_-_@gmail.com> (raw)
In-Reply-To: <aff5b56a37332c8dc302466fc3f2c03866458f24.1687816734.git.mirai@makinata.eu> (Bruno Victal's message of "Mon, 26 Jun 2023 22:59:28 +0100")
Hello,
Bruno Victal <mirai@makinata.eu> writes:
> Introduces 'base-transducer', a SRFI-171 based transducer that can be used as a
> starting point for writing custom configuration record serializing procedures.
>
> This also fixes the symbol maybe-value serialization test case.
>
> * gnu/services/configuration.scm (empty-serializer?): New predicate.
> (base-transducer, tfilter-maybe-value): New procedure.
> (serialize-configuration): Adapt to use base-transducer.
>
> * gnu/services/telephony.scm (jami-account->alist): Use transducers to skip
> fields that are unserializable or whose field maybe-value is unset.
>
> * tests/services/configuration.scm: Remove test-expect-fail.
Pretty cool stuff!
> ---
> gnu/services/configuration.scm | 29 ++++++++++++++++++++++++-----
> gnu/services/telephony.scm | 27 +++++++++++++--------------
> tests/services/configuration.scm | 6 +-----
> 3 files changed, 38 insertions(+), 24 deletions(-)
>
> diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm
> index dafe72f4fe..cd2cb8318b 100644
> --- a/gnu/services/configuration.scm
> +++ b/gnu/services/configuration.scm
> @@ -42,6 +42,7 @@ (define-module (gnu services configuration)
> #:use-module (srfi srfi-26)
> #:use-module (srfi srfi-34)
> #:use-module (srfi srfi-35)
> + #:use-module (srfi srfi-171)
> #:export (configuration-field
> configuration-field-name
> configuration-field-type
> @@ -59,6 +60,10 @@ (define-module (gnu services configuration)
> define-configuration/no-serialization
> no-serialization
>
> + empty-serializer?
> + tfilter-maybe-value
> + base-transducer
> +
> serialize-configuration
> define-maybe
> define-maybe/no-serialization
> @@ -125,13 +130,27 @@ (define-record-type* <configuration-field>
> (default-value-thunk configuration-field-default-value-thunk)
> (documentation configuration-field-documentation))
>
> +(define (empty-serializer? field)
> + (eq? empty-serializer
> + (configuration-field-serializer field)))
> +
> +(define (tfilter-maybe-value config)
> + (tfilter (lambda (field)
> + (let ((field-value ((configuration-field-getter field) config)))
> + (maybe-value-set? field-value)))))
> +
> +(define (base-transducer config)
> + (compose (tremove empty-serializer?)
> + ;; Only serialize fields whose value isn't '%unset-marker%.
> + (tfilter-maybe-value config)
> + (tmap (lambda (field)
> + ((configuration-field-serializer field)
> + (configuration-field-name field)
> + ((configuration-field-getter field) config))))))
> +
Please add docstrings.
> (define (serialize-configuration config fields)
> #~(string-append
> - #$@(map (lambda (field)
> - ((configuration-field-serializer field)
> - (configuration-field-name field)
> - ((configuration-field-getter field) config)))
> - fields)))
> + #$@(list-transduce (base-transducer config) rcons fields)))
>
While at it, please add a docstring for this procedure as well.
> (define-syntax-rule (id ctx parts ...)
> "Assemble PARTS into a raw (unhygienic) identifier."
> diff --git a/gnu/services/telephony.scm b/gnu/services/telephony.scm
> index 23ccb8d403..56b7772f58 100644
> --- a/gnu/services/telephony.scm
> +++ b/gnu/services/telephony.scm
> @@ -37,6 +37,7 @@ (define-module (gnu services telephony)
> #:use-module (srfi srfi-1)
> #:use-module (srfi srfi-2)
> #:use-module (srfi srfi-26)
> + #:use-module (srfi srfi-171)
> #:use-module (ice-9 format)
> #:use-module (ice-9 match)
> #:export (jami-account
> @@ -204,22 +205,20 @@ (define (jami-account->alist jami-account-object)
> ('rendezvous-point? "Account.rendezVous")
> ('peer-discovery? "Account.peerDiscovery")
> ('bootstrap-hostnames "Account.hostname")
> - ('name-server-uri "RingNS.uri")
> - (_ #f)))
> + ('name-server-uri "RingNS.uri")))
>
> - (filter-map (lambda (field)
> - (and-let* ((name (field-name->account-detail
> + (define jami-account-transducer
> + (compose (tremove empty-serializer?)
> + (tfilter-maybe-value jami-account-object)
> + (tmap (lambda (field)
> + (let* ((name (field-name->account-detail
> (configuration-field-name field)))
> - (value ((configuration-field-serializer field)
> - name ((configuration-field-getter field)
> - jami-account-object)))
> - ;; The define-maybe default serializer produces an
> - ;; empty string for unspecified values.
> - (value* (if (string-null? value)
> - #f
> - value)))
> - (cons name value*)))
> - jami-account-fields))
> + (value ((configuration-field-serializer field)
> + name ((configuration-field-getter field)
> + jami-account-object))))
> + (cons name value))))))
> +
> + (list-transduce jami-account-transducer rcons jami-account-fields))
Could you please state in a comment under "(define
jami-account-transducer" why the base transducer doesn't suffice? It
isn't obvious to me from a casual inspection. I guess it's because
base-transducer is not recursive? Should it be?
> (define (jami-account-list? val)
> (and (list? val)
> diff --git a/tests/services/configuration.scm b/tests/services/configuration.scm
> index 8ad5907f37..40a4e74b4d 100644
> --- a/tests/services/configuration.scm
> +++ b/tests/services/configuration.scm
> @@ -337,13 +337,9 @@ (define-maybe symbol)
> (define-configuration config-with-maybe-symbol
> (protocol maybe-symbol ""))
>
> -;;; Maybe symbol values are currently seen as serializable, because the
> -;;; unspecified value is '%unset-marker%, which is a symbol itself.
> -;;; TODO: Remove expected fail marker after resolution.
> -(test-expect-fail 1)
> (test-equal "symbol maybe value serialization, unspecified"
> ""
> - (gexp->approximate-sexp
> + (eval-gexp
> (serialize-configuration (config-with-maybe-symbol)
> config-with-maybe-symbol-fields)))
That's nice, though I don't understand why gexp->approximate needs to be
turned into eval-gexp?
--
Thanks,
Maxim
next prev parent reply other threads:[~2023-10-02 17:27 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-09 21:18 [bug#63985] [PATCH RFC 0/5] Generic INI serializer & SRFI-171 for define-configuration Bruno Victal
2023-06-09 21:20 ` [bug#63985] [PATCH RFC 1/5] services: configuration: Simplify normalize-extra-args Bruno Victal
2023-06-09 21:20 ` [bug#63985] [PATCH RFC 2/5] services: configuration: Use transducers within serialize-configuration Bruno Victal
2023-06-09 21:20 ` [bug#63985] [PATCH RFC 3/5] services: fstrim-service-type: Serialize with SRFI-171 transducers Bruno Victal
2023-06-09 21:20 ` [bug#63985] [PATCH RFC 4/5] services: configuration: Add serializer-kwargs field Bruno Victal
2023-06-09 21:21 ` [bug#63985] [PATCH RFC 5/5] services: configuration: New generic-ini module Bruno Victal
2023-06-10 20:10 ` [bug#63985] [PATCH RFC v2 1/5] services: configuration: Simplify normalize-extra-args Bruno Victal
2023-06-10 20:10 ` [bug#63985] [PATCH RFC v2 2/5] services: configuration: Use transducers within serialize-configuration Bruno Victal
2023-06-10 20:10 ` [bug#63985] [PATCH RFC v2 3/5] services: fstrim-service-type: Serialize with SRFI-171 transducers Bruno Victal
2023-06-10 20:10 ` [bug#63985] [PATCH RFC v2 4/5] services: configuration: Add serializer-options field Bruno Victal
2023-06-10 20:10 ` [bug#63985] [PATCH RFC v2 5/5] services: configuration: New generic-ini module Bruno Victal
2023-06-26 21:57 ` [bug#63985] [PATCH v3 00/11] Service subsystem improvements Bruno Victal
2023-06-26 21:59 ` [bug#63985] [PATCH v3 01/11] services: configuration: Simplify normalize-extra-args Bruno Victal
2023-10-02 17:00 ` [bug#63985] [PATCH RFC 0/5] Generic INI serializer & SRFI-171 for define-configuration Maxim Cournoyer
2023-10-07 12:36 ` [bug#63985] [PATCH v3 01/11] services: configuration: Simplify normalize-extra-args. (was: bug#63985: [PATCH RFC 0/5] Generic INI serializer & SRFI-171 for define-configuration) Bruno Victal
2023-06-26 21:59 ` [bug#63985] [PATCH v3 02/11] services: configuration: Use transducers within serialize-configuration Bruno Victal
2023-10-02 17:25 ` Maxim Cournoyer [this message]
2023-10-07 13:39 ` [bug#63985] [PATCH v3 02/11] services: configuration: Use transducers within serialize-configuration. (was : bug#63985: [PATCH RFC 0/5] Generic INI serializer & SRFI-171 for define-configuration) Bruno Victal
2023-10-07 14:37 ` Maxim Cournoyer
2023-06-26 21:59 ` [bug#63985] [PATCH v3 03/11] services: fstrim-service-type: Serialize with SRFI-171 transducers Bruno Victal
2023-06-26 21:59 ` [bug#63985] [PATCH v3 04/11] doc: Rewrite define-configuration Bruno Victal
2023-10-02 18:28 ` [bug#63985] [PATCH RFC 0/5] Generic INI serializer & SRFI-171 for define-configuration Maxim Cournoyer
2023-10-07 14:21 ` Bruno Victal
2023-10-07 16:35 ` Maxim Cournoyer
2023-06-26 21:59 ` [bug#63985] [PATCH v3 05/11] services: configuration: Add serializer-options field Bruno Victal
2023-10-02 19:12 ` [bug#63985] [PATCH RFC 0/5] Generic INI serializer & SRFI-171 for define-configuration Maxim Cournoyer
2023-10-06 18:29 ` Bruno Victal
2023-06-26 21:59 ` [bug#63985] [PATCH v3 06/11] services: configuration: New generic-ini module Bruno Victal
2023-10-02 19:15 ` [bug#63985] [PATCH RFC 0/5] Generic INI serializer & SRFI-171 for define-configuration Maxim Cournoyer
2023-06-26 21:59 ` [bug#63985] [PATCH v3 07/11] services: configuration: Add some commonly used predicates Bruno Victal
2023-06-26 21:59 ` [bug#63985] [PATCH v3 08/11] services: NetworkManager: Use define-configuration and generic-ini Bruno Victal
2023-06-26 21:59 ` [bug#63985] [PATCH v3 09/11] services: NetworkManager: Prefer package over network-manager Bruno Victal
2023-10-02 16:52 ` [bug#63985] [PATCH RFC 0/5] Generic INI serializer & SRFI-171 for define-configuration Maxim Cournoyer
2023-06-26 21:59 ` [bug#63985] [PATCH v3 10/11] services: NetworkManager: add log-configuration field Bruno Victal
2023-10-05 16:57 ` Maxim Cournoyer
2023-06-26 21:59 ` [bug#63985] [PATCH v3 11/11] services: NetworkManager: Add extra-options field Bruno Victal
2023-10-05 16:59 ` Maxim Cournoyer
2023-06-27 4:20 ` [bug#63985] [PATCH v3 00/11] Service subsystem improvements Liliana Marie Prikler
2023-09-16 21:22 ` Bruno Victal
2023-09-16 21:55 ` Liliana Marie Prikler
2023-09-23 13:35 ` Bruno Victal
2023-09-23 15:22 ` Liliana Marie Prikler
2023-09-25 14:06 ` Ludovic Courtès
2023-10-07 15:57 ` [bug#63985] [PATCH v4 0/5] SRFI-171 based improvements for define-configuration Bruno Victal
2023-10-07 15:57 ` [bug#63985] [PATCH v4 2/5] services: configuration: Use transducers within serialize-configuration Bruno Victal
2023-10-07 15:59 ` [bug#63985] [PATCH v4 1/5] services: configuration: Simplify normalize-extra-args Bruno Victal
2023-10-07 15:59 ` [bug#63985] [PATCH v4 3/5] services: fstrim-service-type: Serialize with SRFI-171 transducers Bruno Victal
2023-10-07 15:59 ` [bug#63985] [PATCH v4 4/5] doc: Rewrite define-configuration Bruno Victal
2023-10-07 15:59 ` [bug#63985] [PATCH v4 5/5] services: configuration: Add some commonly used predicates Bruno Victal
2023-10-07 16:57 ` bug#63985: SRFI-171 based improvements for define-configuration Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871qed3pi3.fsf_-_@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=63985@debbugs.gnu.org \
--cc=mirai@makinata.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).